[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kstars
From:       Allen Winter <winter () kde ! org>
Date:       2007-12-06 20:10:25
Message-ID: 1196971825.658587.23225.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 745683 by winterz:

don't build the indi stuff unless libusb is available.


 M  +2 -1      CMakeLists.txt  
 M  +3 -1      kstars/CMakeLists.txt  


--- trunk/KDE/kdeedu/kstars/CMakeLists.txt #745682:745683
@@ -5,8 +5,8 @@
 include(CheckIncludeFiles)
 
 find_package(ZLIB REQUIRED)
-find_package(USB)
 
+macro_optional_find_package(USB)
 macro_optional_find_package(CFitsio)
 macro_optional_find_package(SBIG)
 macro_optional_find_package(Nova)
@@ -23,6 +23,7 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kstars.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-kstars.h )  \
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kstars.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config.h )  
+macro_log_feature(LIBUSB_FOUND "libusb" "User level access to USB devices" \
"http://libusb.sourceforge.net/" FALSE "" "for KStars INDI support.")  \
macro_log_feature(SBIG_FOUND "libsbigudrv" "SBIG Universal Driver is needed by \
KStars." "http://indi.sourceforge.net/" FALSE "1.00" "")  \
macro_log_feature(CFITSIO_FOUND "libcfitsio" "CFITSIO Library is needed by KStars." \
"http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" FALSE "3.03" "")  \
macro_log_feature(NOVA_FOUND "libnova" "libnova is needed by KStars." \
                "http://libnova.sourceforge.net" FALSE "0.12.1" "")
--- trunk/KDE/kdeedu/kstars/kstars/CMakeLists.txt #745682:745683
@@ -1,6 +1,8 @@
 add_subdirectory( skycomponents ) 
 add_subdirectory( widgets ) 
-add_subdirectory( indi ) 
+if (LIBUSB_FOUND)
+  add_subdirectory( indi ) 
+endif (LIBUSB_FOUND)
 add_subdirectory( tools ) 
 add_subdirectory( data ) 
 add_subdirectory( icons ) 


[prev in list] [next in list] [prev in thread] [next in thread]