diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2014-08-14 06:45:53 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2014-08-14 06:45:53 -0700 |
| commit | e3826b1a671f4fe9e197b72a9c8dc0aa6976ea0c (patch) | |
| tree | 47d899052407ea405b397786966bf69b6fd78cef /host/cmake | |
| parent | 781d7a24aba25ab045d2f4456071ce9aad3b389c (diff) | |
| download | uhd-e3826b1a671f4fe9e197b72a9c8dc0aa6976ea0c.tar.gz uhd-e3826b1a671f4fe9e197b72a9c8dc0aa6976ea0c.tar.bz2 uhd-e3826b1a671f4fe9e197b72a9c8dc0aa6976ea0c.zip | |
Restoring compatibility with CMake 2.6
* The UNSET command didn't exist back then, but using SET with no value does the same thing
* CMake 2.6 doesn't like nested parantheses in IF statements, so tweak IF/ELSE statements
Diffstat (limited to 'host/cmake')
| -rw-r--r-- | host/cmake/Modules/FindUSB1.cmake | 2 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 34 |
2 files changed, 19 insertions, 17 deletions
diff --git a/host/cmake/Modules/FindUSB1.cmake b/host/cmake/Modules/FindUSB1.cmake index 96e2a5aae..1e8e3ba03 100644 --- a/host/cmake/Modules/FindUSB1.cmake +++ b/host/cmake/Modules/FindUSB1.cmake @@ -23,7 +23,7 @@ FIND_PATH(LIBUSB_INCLUDE_DIRS set(libusb1_library_names usb-1.0 libusb-1.0) #libusb-1.0 compatible library on freebsd -if((CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") OR (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")) +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") list(APPEND libusb1_library_names usb) endif() diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index d1c0fc099..a050a083d 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -63,22 +63,24 @@ ELSEIF(DEBIAN AND LIBUHDDEV_PKG) ELSEIF(DEBIAN AND UHDHOST_PKG) SET(CPACK_PACKAGE_FILE_NAME "uhd-host_${TRIMMED_UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}") ELSE() - FIND_PROGRAM(LSB_RELEASE_EXECUTABLE lsb_release) - IF((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE) - - #extract system information by executing the commands - EXECUTE_PROCESS( - COMMAND ${LSB_RELEASE_EXECUTABLE} --short --id - OUTPUT_VARIABLE LSB_ID OUTPUT_STRIP_TRAILING_WHITESPACE - ) - EXECUTE_PROCESS( - COMMAND ${LSB_RELEASE_EXECUTABLE} --short --release - OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - #set a more sensible package name for this system - SET(CPACK_PACKAGE_FILE_NAME "uhd_${UHD_VERSION}_${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") -ENDIF() + IF(DEBIAN OR REDHAT) + FIND_PROGRAM(LSB_RELEASE_EXECUTABLE lsb_release) + + IF(LSB_RELEASE_EXECUTABLE) + #extract system information by executing the commands + EXECUTE_PROCESS( + COMMAND ${LSB_RELEASE_EXECUTABLE} --short --id + OUTPUT_VARIABLE LSB_ID OUTPUT_STRIP_TRAILING_WHITESPACE + ) + EXECUTE_PROCESS( + COMMAND ${LSB_RELEASE_EXECUTABLE} --short --release + OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + #set a more sensible package name for this system + SET(CPACK_PACKAGE_FILE_NAME "uhd_${UHD_VERSION}_${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") + ENDIF(LSB_RELEASE_EXECUTABLE) + ENDIF(DEBIAN OR REDHAT) ENDIF(DEBIAN AND LIBUHD_PKG) IF(${CPACK_GENERATOR} STREQUAL NSIS) |