Changeset 7418
- Timestamp:
- 09/11/12 16:19:07 (12 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r7387 r7418 297 297 endif(NOT HAVE_LIBUSB EQUAL 0) 298 298 if (OSCamOperatingSystem MATCHES "Mac OS X") 299 if (NOT HAVE_LIBUSB EQUAL 0 )299 if (NOT HAVE_LIBUSB EQUAL 0 AND NOT PRESENT) 300 300 find_file (USBINCL_LOC "libusb-1.0/libusb.h") 301 301 if (EXISTS ${USBINCL_LOC}) … … 304 304 set (PRESENT True) 305 305 endif (EXISTS ${USBINCL_LOC}) 306 endif (NOT HAVE_LIBUSB EQUAL 0 )306 endif (NOT HAVE_LIBUSB EQUAL 0 AND NOT PRESENT) 307 307 endif (OSCamOperatingSystem MATCHES "Mac OS X") 308 308 if (STATIC_LIBUSB EQUAL 0) … … 313 313 endif(HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT) 314 314 else(STATIC_LIBUSB EQUAL 0) 315 if (OSCAM_SYSTEM_NAME MATCHES "Tuxbox") 316 set (STATIC_LIBUSB True) 317 endif (OSCAM_SYSTEM_NAME MATCHES "Tuxbox") 318 if (HAVE_LIBUSB AND HAVE_PTHREAD AND STATIC_LIBUSB AND PRESENT) 315 if (HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT) 319 316 message(STATUS " static libusb 1.0 found (libusb-1.0.a). Adding smartreader support ") 320 317 add_definitions ("-DWITH_LIBUSB") 321 318 set (STATICLIBUSB True) 322 elseif (HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT) 323 message(STATUS " system libusb 1.0 found Adding smartreader support ") 324 add_definitions ("-DWITH_LIBUSB") 325 set (STATICLIBUSB False) 326 else (HAVE_LIBUSB AND HAVE_PTHREAD AND STATIC_LIBUSB AND PRESENT) 319 else (HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT) 327 320 message(STATUS " no libusb 1.0 found. No smartreader support") 328 321 set (HAVE_LIBUSB False) 329 endif (HAVE_LIBUSB AND HAVE_PTHREAD AND STATIC_LIBUSB ANDPRESENT)322 endif (HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT) 330 323 endif(STATIC_LIBUSB EQUAL 0) 331 324 endif (LIBUSBDIR) … … 689 682 message (STATUS " revision: ${CS_SVN_VERSION}") 690 683 if (HAVE_LIBCRYPTO) 691 message (STATUS " use libcrypto functions")684 message (STATUS " use system libcrypto functions") 692 685 else (HAVE_LIBCRYPTO) 693 686 message (STATUS " use built-in crypt functions") -
trunk/utils/CMakeLists.txt
r7387 r7418 189 189 endif (NOT HAVE_LIBUSB EQUAL 0) 190 190 if (OSCamOperatingSystem MATCHES "Mac OS X") 191 if (NOT HAVE_LIBUSB EQUAL 0 )191 if (NOT HAVE_LIBUSB EQUAL 0 AND NOT PRESENT) 192 192 find_file (USBINCL_LOC "libusb-1.0/libusb.h") 193 193 if (EXISTS ${USBINCL_LOC}) … … 196 196 set (PRESENT2 True) 197 197 endif (EXISTS ${USBINCL_LOC}) 198 endif (NOT HAVE_LIBUSB EQUAL 0 )198 endif (NOT HAVE_LIBUSB EQUAL 0 AND NOT PRESENT) 199 199 endif (OSCamOperatingSystem MATCHES "Mac OS X") 200 200 if (STATIC_LIBUSB EQUAL 0) … … 205 205 endif(HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT2) 206 206 else(STATIC_LIBUSB EQUAL 0) 207 if (OSCAM_SYSTEM_NAME MATCHES "Tuxbox") 208 set (STATIC_LIBUSB True) 209 endif (OSCAM_SYSTEM_NAME MATCHES "Tuxbox") 210 if (HAVE_LIBUSB AND HAVE_PTHREAD AND STATIC_LIBUSB AND PRESENT2) 207 if (HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT2) 211 208 message(STATUS " static libusb 1.0 found (libusb-1.0.a). Adding smartreader support ") 212 209 add_definitions ("-DWITH_LIBUSB") 213 210 set (STATICLIBUSB True) 214 elseif (HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT2) 215 message(STATUS " system libusb 1.0 found Adding smartreader support ") 216 add_definitions ("-DWITH_LIBUSB") 217 set (STATICLIBUSB False) 218 else (HAVE_LIBUSB AND HAVE_PTHREAD AND STATIC_LIBUSB AND PRESENT2) 211 else (HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT2) 219 212 message(STATUS " no libusb 1.0 found. No smartreader support") 220 213 set (HAVE_LIBUSB False) 221 endif (HAVE_LIBUSB AND HAVE_PTHREAD AND STATIC_LIBUSB ANDPRESENT2)214 endif (HAVE_LIBUSB AND HAVE_PTHREAD AND PRESENT2) 222 215 endif (STATIC_LIBUSB EQUAL 0) 223 216 endif (LIBUSBDIR)
Note:
See TracChangeset
for help on using the changeset viewer.