summaryrefslogtreecommitdiffstats
path: root/host/cmake/Modules/UHDPackage.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'host/cmake/Modules/UHDPackage.cmake')
-rw-r--r--host/cmake/Modules/UHDPackage.cmake9
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