Changeset 1636
- Timestamp:
- 02/20/10 22:42:31 (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r1625 r1636 162 162 endif(HAVE_DVBAPI) 163 163 164 if (WEBIF) 165 add_definitions ("-DWEBIF") 166 endif (WEBIF) 167 164 168 check_include_file ("pthread.h" HAVE_PTHREAD) 165 169 if (HAVE_PTHREAD) … … 238 242 add_library(imp_libusb STATIC IMPORTED) 239 243 set_property(TARGET imp_libusb PROPERTY IMPORTED_LOCATION /usr/local/lib/libusb-1.0.a) 244 elseif (EXISTS /usr/lib/libusb-1.0.a) 245 message(STATUS " static libusb 1.0 found : /usr/lib/libusb-1.0.a . Adding smartreader support ") 246 add_definitions ("-DLIBUSB") 247 add_library(imp_libusb STATIC IMPORTED) 248 set_property(TARGET imp_libusb PROPERTY IMPORTED_LOCATION /usr/lib/libusb-1.0.a) 240 249 else (EXISTS /usr/local/lib/libusb-1.0.a) 241 message(STATUS " static libusb 1.0 not found ( /usr/local/lib/libusb-1.0.a) . No smartreader support ")250 message(STATUS " static libusb 1.0 not found (not in /usr/local/lib/ or /usr/lib/) . No smartreader support ") 242 251 unset(HAVE_LIBUSB) 243 252 unset(HAVE_LIBRT) … … 488 497 message (STATUS " use system libusb functions") 489 498 endif (HAVE_LIBUSB) 499 if (WEBIF) 500 message (STATUS " Web interface enabled") 501 endif (WEBIF) 490 502 message (STATUS "") -
trunk/utils/CMakeLists.txt
r1592 r1636 184 184 if (HAVE_LIBUSB AND HAVE_PTHREAD) 185 185 if (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 186 message(STATUS " 186 message(STATUS "Utils: static libusb 1.0 found (${LIBUSBDIR}/lib/libusb-1.0.a). Adding smartreader support ") 187 187 add_definitions ("-DLIBUSB") 188 188 add_definitions ("-I${LIBUSBDIR}/include/") … … 190 190 set_property(TARGET utils_imp_libusb PROPERTY IMPORTED_LOCATION ${LIBUSBDIR}/lib/libusb-1.0.a) 191 191 else (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 192 message(STATUS " static libusb 1.0 not found (${LIBUSBDIR}/lib/libusb-1.0.a). No smartreader support ")192 message(STATUS "Utils: static libusb 1.0 not found (${LIBUSBDIR}/lib/libusb-1.0.a). No smartreader support ") 193 193 unset(HAVE_LIBUSB) 194 194 unset(HAVE_LIBRT) … … 196 196 endif (EXISTS ${LIBUSBDIR}/lib/libusb-1.0.a) 197 197 else (HAVE_LIBUSB AND HAVE_PTHREAD) 198 message(STATUS " 198 message(STATUS "Utils: no libusb 1.0 found. No smartreader support") 199 199 endif (HAVE_LIBUSB AND HAVE_PTHREAD) 200 200 else (LIBUSBDIR) … … 202 202 if (HAVE_LIBUSB AND HAVE_PTHREAD) 203 203 if (EXISTS /usr/local/lib/libusb-1.0.a) 204 message(STATUS " 204 message(STATUS "Utils: static libusb 1.0 found : /usr/local/lib/libusb-1.0.a . Adding smartreader support ") 205 205 add_definitions ("-DLIBUSB") 206 206 add_definitions ("-I/usr/local/include") 207 207 add_library(utils_imp_libusb STATIC IMPORTED) 208 208 set_property(TARGET utils_imp_libusb PROPERTY IMPORTED_LOCATION /usr/local/lib/libusb-1.0.a) 209 elseif (EXISTS /usr/lib/libusb-1.0.a) 210 message(STATUS "Utils: static libusb 1.0 found : /usr/lib/libusb-1.0.a . Adding smartreader support ") 211 add_definitions ("-DLIBUSB") 212 add_library(utils_imp_libusb STATIC IMPORTED) 213 set_property(TARGET utils_imp_libusb PROPERTY IMPORTED_LOCATION /usr/lib/libusb-1.0.a) 209 214 else (EXISTS /usr/local/lib/libusb-1.0.a) 210 message(STATUS " static libusb 1.0 not found (/usr/local/lib/libusb-1.0.a) . No smartreader support ")215 message(STATUS "Utils: static libusb 1.0 not found (not in /usr/local/lib/ or /usr/lib/) . No smartreader support ") 211 216 unset(HAVE_LIBUSB) 212 217 unset(HAVE_LIBRT) … … 220 225 221 226 227 if( HAVE_LIBRT OR HAVE_LIBRT_STATIC) 222 228 #---- are we building ? 223 229 if (HAVE_LIBUSB) … … 234 240 add_executable (${util_name} ${exe_srcs} ${exe_hdrs}) 235 241 236 target_link_libraries (${util_name} utils_imp_libusb) 237 238 if(HAVE_LIBRT AND NOT OSCamOperatingSystem MATCHES "Mac OS X") 239 target_link_libraries (${util_name} rt) 240 endif(HAVE_LIBRT AND NOT OSCamOperatingSystem MATCHES "Mac OS X") 241 242 if (HAVE_LIBRT_STATIC) 243 target_link_libraries (${util_name} utils_imp_librt) 244 endif (HAVE_LIBRT_STATIC) 242 if(HAVE_LIBRT AND HAVE_LIBUSB) 243 target_link_libraries (${util_name} imp_libusb) 244 if (NOT OSCamOperatingSystem MATCHES "Mac OS X") 245 target_link_libraries (${util_name} rt) 246 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 247 endif(HAVE_LIBRT AND HAVE_LIBUSB) 248 249 if (HAVE_LIBRT_STATIC AND HAVE_LIBUSB) 250 target_link_libraries (${util_name} imp_libusb) 251 if (NOT OSCamOperatingSystem MATCHES "Mac OS X") 252 target_link_libraries (${util_name} imp_librt) 253 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") 254 endif (HAVE_LIBRT_STATIC AND HAVE_LIBUSB) 245 255 246 256 if (HAVE_PTHREAD) … … 307 317 #----------------------- printout resume ----------------------------- 308 318 309 message (STATUS "Utils: 310 message (STATUS "Utils: 311 message (STATUS "Utils: 312 message (STATUS "Utils: 313 message (STATUS "Utils: 314 message (STATUS "Utils: 319 message (STATUS "Utils: operating system: ${OSCamOperatingSystem}") 320 message (STATUS "Utils: system type: ${CS_OSTYPE}") 321 message (STATUS "Utils: system: ${CS_OS_SYS}") 322 message (STATUS "Utils: cpu: ${CS_OS_CPU}") 323 message (STATUS "Utils: hw: ${CS_OS_HW}") 324 message (STATUS "Utils: use system static libusb") 315 325 message (STATUS "") 316 326 endif (HAVE_LIBUSB) 327 endif( HAVE_LIBRT OR HAVE_LIBRT_STATIC)
Note:
See TracChangeset
for help on using the changeset viewer.