Skip to content

Commit 951c981

Browse files
committed
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
1 parent 3d55191 commit 951c981

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

OwnCloudCPack.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ set( CPACK_PACKAGE_VERSION ${MIRALL_VERSION_FULL}${MIRALL_VERSION_SUFFIX} )
1818
if(APPLE)
1919
set( CPACK_GENERATOR "DragNDrop" )
2020
set( CPACK_SOURCE_GENERATOR "")
21-
set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION} )
21+
set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} )
2222
set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)
2323

2424
set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
2525
# set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
2626

2727
set( CPACK_DMG_FORMAT "UDBZ" )
28-
set( CPACK_DMG_VOLUME_NAME "${APPLICATION_NAME}")
28+
set( CPACK_DMG_VOLUME_NAME "${APPLICATION_SHORTNAME}")
2929

3030
# did not work with cmake 2.8.7, so we override MacOSXBundleInfo.plist.in
3131
#set( CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/admin/osx/Info.plist )
@@ -48,8 +48,8 @@ if(WIN32)
4848
set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project /path/to/project/ReadMe.txt
4949
set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "${APPLICATION_NAME} Syncing Client" ) # Description summary of a project
5050
# CPACK_PACKAGE_EXECUTABLES List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts. ccmake;CMake
51-
set( CPACK_PACKAGE_INSTALL_DIRECTORY ${APPLICATION_NAME} ) # Installation directory on the target system -> C:\Program Files\fellody
52-
set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_NAME} ) # Registry key used when installing this project CMake 2.5.0
51+
set( CPACK_PACKAGE_INSTALL_DIRECTORY ${APPLICATION_SHORTNAME} ) # Installation directory on the target system -> C:\Program Files\fellody
52+
set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_SHORTNAME} ) # Registry key used when installing this project CMake 2.5.0
5353
set( CPACK_PACKAGE_NAME ${APPLICATION_NAME} ) # Package name, defaults to the project name
5454
set( CPACK_PACKAGE_VENDOR "http://${APPLICATION_DOMAIN}" ) # Package vendor name
5555
endif()

0 commit comments

Comments
 (0)