[Kstars-devel] KDE/kdeedu/kstars/kstars
Jasem Mutlaq
mutlaqja at ikarustech.com
Sun Nov 25 07:59:57 CET 2007
SVN commit 741234 by mutlaqja:
NOVA related compile issue fixed. Sorry for the problem.
CCMAIL:kstars-devel at kde.org
M +5 -1 CMakeLists.txt
M +94 -18 indi/CMakeLists.txt
--- trunk/KDE/kdeedu/kstars/kstars/CMakeLists.txt #741233:741234
@@ -263,7 +263,7 @@
SatLib
htmesh
${ZLIB_LIBRARIES}
- ${NOVA_LIBRARIES})
+ )
if(WIN32)
target_link_libraries(kstars kstarscomponents htmesh SatLib)
endif(WIN32)
@@ -274,6 +274,10 @@
target_link_libraries(kstars ${CFITSIO_LIBRARIES})
endif (CFITSIO_FOUND)
+if (NOVA_FOUND)
+ target_link_libraries(kstars ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS kstars
RUNTIME DESTINATION ${BIN_INSTALL_DIR}
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
--- trunk/KDE/kdeedu/kstars/kstars/indi/CMakeLists.txt #741233:741234
@@ -134,6 +134,10 @@
target_link_libraries(sbigudrv)
+if (NOVA_FOUND)
+ target_link_libraries(sbigudrv ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
set_target_properties(sbigudrv PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS sbigudrv
RUNTIME DESTINATION ${BIN_INSTALL_DIR}
@@ -155,8 +159,12 @@
kde4_add_executable(indiserver NOGUI ${indiserver_SRCS} ${liblilxml_SRCS})
-target_link_libraries(indiserver ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES} pthread )
+target_link_libraries(indiserver ${KDE4_KDECORE_LIBS} pthread )
+if (NOVA_FOUND)
+ target_link_libraries(indiserver ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indiserver DESTINATION ${BIN_INSTALL_DIR} )
#####################################
@@ -171,8 +179,12 @@
kde4_add_executable(indi_lx200basic NOGUI ${lx200basic_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_lx200basic ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES} )
+target_link_libraries(indi_lx200basic ${KDE4_KDECORE_LIBS})
+if (NOVA_FOUND)
+ target_link_libraries(indi_lx200basic ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_lx200basic DESTINATION ${BIN_INSTALL_DIR} )
#################################################################################
@@ -189,8 +201,12 @@
kde4_add_executable(indi_lx200generic NOGUI ${lx200generic_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_lx200generic ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES} m )
+target_link_libraries(indi_lx200generic ${KDE4_KDECORE_LIBS} m )
+if (NOVA_FOUND)
+ target_link_libraries(indi_lx200generic ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_lx200generic DESTINATION ${BIN_INSTALL_DIR} )
#TODO fix for windows.
@@ -214,8 +230,12 @@
kde4_add_executable(indi_celestron_gps NOGUI ${celestrongps_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_celestron_gps ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES} m )
+target_link_libraries(indi_celestron_gps ${KDE4_KDECORE_LIBS} m )
+if (NOVA_FOUND)
+ target_link_libraries(indi_lx200basic ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_celestron_gps DESTINATION ${BIN_INSTALL_DIR} )
#################################################################################
@@ -227,8 +247,12 @@
kde4_add_executable(indi_orion_atlas NOGUI ${orionatlas_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_orion_atlas ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES})
+target_link_libraries(indi_orion_atlas ${KDE4_KDECORE_LIBS})
+if (NOVA_FOUND)
+ target_link_libraries(indi_orion_atlas ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_orion_atlas DESTINATION ${BIN_INSTALL_DIR} )
#################################################################################
@@ -257,8 +281,12 @@
kde4_add_executable(indi_skycommander ${skycommander_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_skycommander ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES} m )
+target_link_libraries(indi_skycommander ${KDE4_KDECORE_LIBS} m )
+if (NOVA_FOUND)
+ target_link_libraries(indi_skycommander ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_skycommander DESTINATION ${BIN_INSTALL_DIR} )
#################################################################################
@@ -271,8 +299,12 @@
kde4_add_executable(indi_intelliscope ${intelliscope_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_intelliscope ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES} m )
+target_link_libraries(indi_intelliscope ${KDE4_KDECORE_LIBS} m )
+if (NOVA_FOUND)
+ target_link_libraries(indi_intelliscope ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_intelliscope DESTINATION ${BIN_INSTALL_DIR} )
#################################################################################
@@ -297,8 +329,12 @@
kde4_add_executable(indi_fli_pdf ${flipdf_SRCS} ${libfli_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_fli_pdf m ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES})
+target_link_libraries(indi_fli_pdf m ${KDE4_KDECORE_LIBS})
+if (NOVA_FOUND)
+ target_link_libraries(indi_fli_pdf ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_fli_pdf DESTINATION ${BIN_INSTALL_DIR} )
#################################################################################
@@ -313,8 +349,12 @@
kde4_add_executable(indi_robofocus ${robofocus_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_robofocus ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES})
+target_link_libraries(indi_robofocus ${KDE4_KDECORE_LIBS})
+if (NOVA_FOUND)
+ target_link_libraries(indi_robofocus ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_robofocus DESTINATION ${BIN_INSTALL_DIR} )
#################################################################################
@@ -331,8 +371,12 @@
kde4_add_executable(indi_trutech_wheel ${trutechwheel_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_trutech_wheel ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES})
+target_link_libraries(indi_trutech_wheel ${KDE4_KDECORE_LIBS})
+if (NOVA_FOUND)
+ target_link_libraries(indi_trutech_wheel ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_trutech_wheel DESTINATION ${BIN_INSTALL_DIR} )
#################################################################################
@@ -345,8 +389,12 @@
kde4_add_executable(indi_fli_wheel ${fliwheel_SRCS} ${libfli_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_fli_wheel ${KDE4_KDECORE_LIBS} ${NOVA_LIBRARIES})
+target_link_libraries(indi_fli_wheel ${KDE4_KDECORE_LIBS})
+if (NOVA_FOUND)
+ target_link_libraries(indi_fli_wheel ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_fli_wheel DESTINATION ${BIN_INSTALL_DIR} )
#################################################################################
@@ -364,8 +412,12 @@
kde4_add_executable(indi_fli_ccd ${fliccd_SRCS} ${libfli_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_fli_ccd ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} ${NOVA_LIBRARIES})
+target_link_libraries(indi_fli_ccd ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES})
+if (NOVA_FOUND)
+ target_link_libraries(indi_fli_ccd ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_fli_ccd DESTINATION ${BIN_INSTALL_DIR} )
endif (CFITSIO_FOUND)
@@ -382,8 +434,12 @@
kde4_add_executable(indi_apogee_alta ${apogee_alta_SRCS} ${libfli_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_apogee_alta ${KDE4_KDECORE_LIBS} ${LIBUSB_LIBRARIES} ${CFITSIO_LIBRARIES} ${NOVA_LIBRARIES})
+target_link_libraries(indi_apogee_alta ${KDE4_KDECORE_LIBS} ${LIBUSB_LIBRARIES} ${CFITSIO_LIBRARIES})
+if (NOVA_FOUND)
+ target_link_libraries(indi_apogee_alta ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_apogee_alta DESTINATION ${BIN_INSTALL_DIR} )
endif (CFITSIO_FOUND)
@@ -400,8 +456,12 @@
kde4_add_executable(indi_sbig_ccd ${sbigccd_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_sbig_ccd ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} ${SBIG_LIBRARIES} ${NOVA_LIBRARIES})
+target_link_libraries(indi_sbig_ccd ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} ${SBIG_LIBRARIES})
+if (NOVA_FOUND)
+ target_link_libraries(indi_sbig_ccd ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_sbig_ccd DESTINATION ${BIN_INSTALL_DIR} )
endif (CFITSIO_FOUND)
@@ -422,8 +482,12 @@
kde4_add_executable(indi_sbig_stv NOGUI ${stv_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_sbig_stv ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} ${NOVA_LIBRARIES})
+target_link_libraries(indi_sbig_stv ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES})
+if (NOVA_FOUND)
+ target_link_libraries(indi_sbig_stv ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_sbig_stv DESTINATION ${BIN_INSTALL_DIR} )
endif(CFITSIO_FOUND)
@@ -443,8 +507,12 @@
kde4_add_executable(indi_meade_lpi ${meade_lpi_SRCS} ${libwebcam_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_meade_lpi ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} ${NOVA_LIBRARIES})
+target_link_libraries(indi_meade_lpi ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES})
+if (NOVA_FOUND)
+ target_link_libraries(indi_meade_lpi ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_meade_lpi DESTINATION ${BIN_INSTALL_DIR} )
endif (CFITSIO_FOUND)
@@ -463,8 +531,12 @@
kde4_add_executable(indi_v4l_philips ${v4lphilips_SRCS} ${libwebcam_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_v4l_philips m z ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} ${NOVA_LIBRARIES})
+target_link_libraries(indi_v4l_philips m z ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES})
+if (NOVA_FOUND)
+ target_link_libraries(indi_v4l_philips ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_v4l_philips DESTINATION ${BIN_INSTALL_DIR} )
endif (CFITSIO_FOUND)
@@ -482,8 +554,12 @@
kde4_add_executable(indi_v4l_generic ${v4ldriver_SRCS} ${libwebcam_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-target_link_libraries(indi_v4l_generic m z ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES} ${NOVA_LIBRARIES})
+target_link_libraries(indi_v4l_generic m z ${KDE4_KDECORE_LIBS} ${CFITSIO_LIBRARIES})
+if (NOVA_FOUND)
+ target_link_libraries(indi_v4l_generic ${NOVA_LIBRARIES})
+endif (NOVA_FOUND)
+
install(TARGETS indi_v4l_generic DESTINATION ${BIN_INSTALL_DIR} )
endif (CFITSIO_FOUND)
More information about the Kstars-devel
mailing list