diff options
| author | Klaas Freitag <freitag@owncloud.com> | 2015-07-16 15:38:59 +0300 |
|---|---|---|
| committer | Klaas Freitag <freitag@owncloud.com> | 2015-07-16 15:38:59 +0300 |
| commit | 951c9812f13e6dd5018190bda413a0af83152e41 (patch) | |
| tree | 1177739cd0f7b41e208b7aaefe644192a3cd9e48 /OwnCloudCPack.cmake | |
| parent | 3d55191573e39962422f629c7df35f01c501c052 (diff) | |
CPack: Use APPLICATION_SHORTNAME rather than APPLICATION_NAME
especially at places where the file system is hit. APPLICATION_NAME
may contain colons and other strange chars. APPLICATION_SHORTNAME
has to be a clean name.
This fixes client#3445
Diffstat (limited to 'OwnCloudCPack.cmake')
| -rw-r--r-- | OwnCloudCPack.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OwnCloudCPack.cmake b/OwnCloudCPack.cmake index 8716ff5ab..cad12d1b9 100644 --- a/OwnCloudCPack.cmake +++ b/OwnCloudCPack.cmake @@ -18,14 +18,14 @@ set( CPACK_PACKAGE_VERSION ${MIRALL_VERSION_FULL}${MIRALL_VERSION_SUFFIX} ) if(APPLE) set( CPACK_GENERATOR "DragNDrop" ) set( CPACK_SOURCE_GENERATOR "") - set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION} ) + set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} ) set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns) set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in") # set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" ) set( CPACK_DMG_FORMAT "UDBZ" ) - set( CPACK_DMG_VOLUME_NAME "${APPLICATION_NAME}") + set( CPACK_DMG_VOLUME_NAME "${APPLICATION_SHORTNAME}") # did not work with cmake 2.8.7, so we override MacOSXBundleInfo.plist.in #set( CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/admin/osx/Info.plist ) @@ -48,8 +48,8 @@ if(WIN32) set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project /path/to/project/ReadMe.txt set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "${APPLICATION_NAME} Syncing Client" ) # Description summary of a project # CPACK_PACKAGE_EXECUTABLES List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts. ccmake;CMake - set( CPACK_PACKAGE_INSTALL_DIRECTORY ${APPLICATION_NAME} ) # Installation directory on the target system -> C:\Program Files\fellody - set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_NAME} ) # Registry key used when installing this project CMake 2.5.0 + set( CPACK_PACKAGE_INSTALL_DIRECTORY ${APPLICATION_SHORTNAME} ) # Installation directory on the target system -> C:\Program Files\fellody + set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_SHORTNAME} ) # Registry key used when installing this project CMake 2.5.0 set( CPACK_PACKAGE_NAME ${APPLICATION_NAME} ) # Package name, defaults to the project name set( CPACK_PACKAGE_VENDOR "http://${APPLICATION_DOMAIN}" ) # Package vendor name endif() |