[Kstars-devel] KDE/kdeedu/kstars/kstars/indi

[Jason Harris]

SVN commit 614947 by harris:

Fix compile.  The new cfitsio shared lib needs to be linked against 
libm.  Also, there's something wrong with this #ifdef wrapper in 
indicom.h:

#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif

I have termios.h, but it isn't being included by the above code.  This 
is on Linux (gentoo).    As a workaround, I added a duplicate #include 
to indicom.c.  This will break compilation on w32, but I'll leave it to 
the windows guys to figure out what is wrong with that ifdef.

CCMAIL: kstars-devel at kde.org
CCMAIL: Ralf.Habacker at freenet.de



 M  +1 -1      CMakeLists.txt  
 M  +3 -0      indicom.c  


--- trunk/KDE/kdeedu/kstars/kstars/indi/CMakeLists.txt #614946:614947
@@ -165,7 +165,7 @@
 
 kde4_add_library(cfitsio SHARED ${libcfitsio_SRCS})
 
-target_link_libraries(cfitsio)
+target_link_libraries(cfitsio m)
 
 install(TARGETS cfitsio DESTINATION ${LIB_INSTALL_DIR} )
 set (libcfitsio_SRCS "")
--- trunk/KDE/kdeedu/kstars/kstars/indi/indicom.c #614946:614947
@@ -40,6 +40,9 @@
 #include <errno.h>
 #include <stdarg.h>
 
+//FIXME: this is #ifdef'd in indicom.h, but there's something wrong with the conditional
+#include <termios.h>
+
 #include "indicom.h"
 #ifdef _WIN32
 #undef CX