summaryrefslogtreecommitdiffstats
path: root/host/Modules
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-03-25 15:04:23 -0700
committerJosh Blum <josh@joshknows.com>2011-03-25 15:04:23 -0700
commit2249acd9f97e969f619fa87cb206fc9392b9b5fe (patch)
tree5e63e918e3aad03512d565c9abc6cb0324c34ce5 /host/Modules
parent95b966a599c0030921dc6b530ca8c94633d905f6 (diff)
downloaduhd-2249acd9f97e969f619fa87cb206fc9392b9b5fe.tar.gz
uhd-2249acd9f97e969f619fa87cb206fc9392b9b5fe.tar.bz2
uhd-2249acd9f97e969f619fa87cb206fc9392b9b5fe.zip
uhd: work on mac osx packaging
Renamed README type files to have .txt extension (needed for CPACK_RESOURCE_FILE_*). Tweaks to the cpack setup on CPACK_RESOURCE_FILE_* and handling for when UHD_PACKAGE_MODE==AUTO. As of this commit, the mac packages do not contain the .dylib files (do not know why yet).
Diffstat (limited to 'host/Modules')
-rw-r--r--host/Modules/UHDPackage.cmake12
1 files changed, 10 insertions, 2 deletions
diff --git a/host/Modules/UHDPackage.cmake b/host/Modules/UHDPackage.cmake
index 8ca8995cd..65897ceef 100644
--- a/host/Modules/UHDPackage.cmake
+++ b/host/Modules/UHDPackage.cmake
@@ -52,6 +52,13 @@ IF(UHD_PACKAGE_MODE STREQUAL AUTO)
SET(CPACK_PACKAGE_FILE_NAME "UHD-${UHD_VERSION}-${_os_name}-${_os_version}-${_machine}")
ENDIF(LSB_RELEASE_EXECUTABLE AND UNAME_EXECUTABLE)
+
+ IF(APPLE)
+ SET(CPACK_GENERATOR PackageMaker)
+ ELSEIF(WIN32)
+ SET(CPACK_GENERATOR NSIS)
+ ENDIF()
+
ENDIF(UHD_PACKAGE_MODE STREQUAL AUTO)
########################################################################
@@ -63,8 +70,9 @@ SET(CPACK_PACKAGE_CONTACT "support@ettus.com")
SET(CPACK_PACKAGE_VERSION_MAJOR ${UHD_VERSION_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${UHD_VERSION_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${UHD_VERSION_PATCH})
-SET(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README)
-SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
+SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.txt)
+SET(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/AUTHORS.txt)
+SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt)
########################################################################
# Setup CPack Components