diff options
| author | michael-west <michael.west@ettus.com> | 2014-03-25 15:59:03 -0700 |
|---|---|---|
| committer | michael-west <michael.west@ettus.com> | 2014-03-25 15:59:03 -0700 |
| commit | 04292f9b109479b639add31f83fd240a6387f488 (patch) | |
| tree | 4b8723a4ae63626029704f901ee0083bb23bc1e9 /host/cmake/Modules/UHDPackage.cmake | |
| parent | 09915aa57bc88099cbcbbe925946ae65bc0ad8f0 (diff) | |
| parent | ff8a1252f3a51369abe0a165d963b781089ec66c (diff) | |
| download | uhd-04292f9b109479b639add31f83fd240a6387f488.tar.gz uhd-04292f9b109479b639add31f83fd240a6387f488.tar.bz2 uhd-04292f9b109479b639add31f83fd240a6387f488.zip | |
Merge branch 'master' into mwest/b200_docs
Diffstat (limited to 'host/cmake/Modules/UHDPackage.cmake')
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 4968571b5..a98a52fc7 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -1,5 +1,5 @@ # -# Copyright 2010-2013 Ettus Research LLC +# Copyright 2010-2014 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -149,7 +149,7 @@ SET(CPACK_COMPONENTS_ALL libraries headers utilities examples manual doxygen rea ######################################################################## # Setup CPack Debian ######################################################################## -SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libusb-1.0-0, libboost-all-dev") +SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-all-dev") SET(CPACK_DEBIAN_PACKAGE_RECOMMENDS "python, python-tk") FOREACH(filename preinst postinst prerm postrm) LIST(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_BINARY_DIR}/debian/${filename}) @@ -167,7 +167,7 @@ CONFIGURE_FILE( ######################################################################## # Setup CPack RPM ######################################################################## -SET(CPACK_RPM_PACKAGE_REQUIRES "boost-devel, libusb1") +SET(CPACK_RPM_PACKAGE_REQUIRES "boost-devel") FOREACH(filename post_install post_uninstall pre_install pre_uninstall) STRING(TOUPPER ${filename} filename_upper) @@ -200,4 +200,7 @@ IF(MSVC) ENDIF(MSVC) ######################################################################## +IF(NOT ${CPACK_GENERATOR} STREQUAL NSIS) + SET(CPACK_SET_DESTDIR "ON") +ENDIF(NOT ${CPACK_GENERATOR} STREQUAL NSIS) INCLUDE(CPack) #include after setting vars |