diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-22 11:57:44 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-22 11:57:44 -0700 |
| commit | 52d66cca9d4930f49dd95696b2075d92662bc85e (patch) | |
| tree | f74984385c538a232b6af21094c2db88b6056d87 | |
| parent | 55b4ca73b44735523e5ab3348735a64cbf19cf30 (diff) | |
| download | uhd-52d66cca9d4930f49dd95696b2075d92662bc85e.tar.gz uhd-52d66cca9d4930f49dd95696b2075d92662bc85e.tar.bz2 uhd-52d66cca9d4930f49dd95696b2075d92662bc85e.zip | |
uhd: work on debian package requirements in cpack setup
| -rw-r--r-- | host/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/Modules/UHDPackage.cmake | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 590f1b138..4160e8186 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -110,8 +110,8 @@ IF(MSVC) ENDIF(BOOST_ALL_DYN_LINK) ENDIF(MSVC) -SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44") -FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) +SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" "1.45.0" "1.45" "1.46.0" "1.46") +FIND_PACKAGE(Boost 1.36 COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) diff --git a/host/Modules/UHDPackage.cmake b/host/Modules/UHDPackage.cmake index 6e0af31ba..9c0aa0de8 100644 --- a/host/Modules/UHDPackage.cmake +++ b/host/Modules/UHDPackage.cmake @@ -23,7 +23,7 @@ INCLUDE(UHDVersion) #sets version information ######################################################################## SET(CPACK_PACKAGE_FILE_NAME "UHD-${UHD_VERSION}") IF(DEFINED UHD_PACKAGE_SUFFIX) #append optional suffix (usually system type) - SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${UHD_PACKAGE_SUFFIX}) + SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${UHD_PACKAGE_SUFFIX}") ENDIF(DEFINED UHD_PACKAGE_SUFFIX) ######################################################################## @@ -66,22 +66,13 @@ SET(CPACK_COMPONENTS_ALL libraries headers utilities examples tests manual doxyg ######################################################################## # Setup CPack Debian ######################################################################## -SET(BOOST_MIN_VERSION 1.36) #used in setup for boost -STRING(REPLACE "," ", " CPACK_DEBIAN_PACKAGE_DEPENDS - "libboost-date-time-dev (>= ${BOOST_MIN_VERSION})," - "libboost-filesystem-dev (>= ${BOOST_MIN_VERSION})," - "libboost-program-options-dev (>= ${BOOST_MIN_VERSION})," - "libboost-regex-dev (>= ${BOOST_MIN_VERSION})," - "libboost-system-dev (>= ${BOOST_MIN_VERSION})," - "libboost-test-dev (>= ${BOOST_MIN_VERSION})," - "libboost-thread-dev (>= ${BOOST_MIN_VERSION})" -) +SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libusb-1.0-0, libboost-dev") SET(CPACK_DEBIAN_PACKAGE_RECOMMENDS "python, python-tk") ######################################################################## # Setup CPack RPM ######################################################################## -SET(CPACK_RPM_PACKAGE_REQUIRES "boost-devel >= ${BOOST_MIN_VERSION}") +SET(CPACK_RPM_PACKAGE_REQUIRES "boost-devel") ######################################################################## INCLUDE(CPack) #include after setting vars |