summaryrefslogtreecommitdiffstats
path: root/host/Modules
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-03-22 11:57:44 -0700
committerJosh Blum <josh@joshknows.com>2011-03-22 11:57:44 -0700
commit52d66cca9d4930f49dd95696b2075d92662bc85e (patch)
treef74984385c538a232b6af21094c2db88b6056d87 /host/Modules
parent55b4ca73b44735523e5ab3348735a64cbf19cf30 (diff)
downloaduhd-52d66cca9d4930f49dd95696b2075d92662bc85e.tar.gz
uhd-52d66cca9d4930f49dd95696b2075d92662bc85e.tar.bz2
uhd-52d66cca9d4930f49dd95696b2075d92662bc85e.zip
uhd: work on debian package requirements in cpack setup
Diffstat (limited to 'host/Modules')
-rw-r--r--host/Modules/UHDPackage.cmake15
1 files changed, 3 insertions, 12 deletions
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