diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-04 16:22:38 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-04 16:22:38 -0700 |
| commit | dcd555636c282ac0454b463c91d360ce062e316d (patch) | |
| tree | 8d26c23a40b68f7816814c81bdbe0ae820e8bff3 | |
| parent | 1ba366a94ef70980fb5db5dd0142c3d3596ef9aa (diff) | |
| download | uhd-dcd555636c282ac0454b463c91d360ce062e316d.tar.gz uhd-dcd555636c282ac0454b463c91d360ce062e316d.tar.bz2 uhd-dcd555636c282ac0454b463c91d360ce062e316d.zip | |
uhd: set CPACK_PACKAGE_INSTALL_DIRECTORY on NSIS so we dont get an inconsistent version suffix
| -rw-r--r-- | host/Modules/UHDPackage.cmake | 4 | ||||
| -rw-r--r-- | host/lib/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/host/Modules/UHDPackage.cmake b/host/Modules/UHDPackage.cmake index 4986e314c..bf31df3b3 100644 --- a/host/Modules/UHDPackage.cmake +++ b/host/Modules/UHDPackage.cmake @@ -69,6 +69,10 @@ IF(UHD_RELEASE_MODE) ENDIF(LSB_RELEASE_EXECUTABLE) + IF(${CPACK_GENERATOR} STREQUAL NSIS) + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}") + ENDIF() + ENDIF(UHD_RELEASE_MODE) ######################################################################## diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index e65a2d2ba..8ca7c7dca 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -90,7 +90,7 @@ IF(UNIX) FILE(TO_NATIVE_PATH /usr/${PKG_DATA_DIR} INSTALLER_PKG_DATA_DIR) ELSE() #for the NSIS installer, this will be the default path for package data - FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX} ${UHD_VERSION}/${PKG_DATA_DIR}" INSTALLER_PKG_DATA_DIR) + FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${PKG_DATA_DIR}" INSTALLER_PKG_DATA_DIR) ENDIF() STRING(REPLACE "\\" "\\\\" INSTALLER_PKG_DATA_DIR ${INSTALLER_PKG_DATA_DIR}) MESSAGE(STATUS "Installer package data directory: ${INSTALLER_PKG_DATA_DIR}") |