diff options
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | OWNCLOUD.cmake | 3 | ||||
| -rw-r--r-- | OwnCloudCPack.cmake | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b1d4f203..123b3f85d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,16 +22,19 @@ else() set(APPLICATION_REV_DOMAIN_INSTALLER ${APPLICATION_REV_DOMAIN}) endif() -if (NOT DEFINED APPLICATION_SHORTNAME) - set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} ) -endif() - # For usage in XML files we preprocess string(REPLACE "&" "&" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME}") string(REPLACE "<" "<" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}") string(REPLACE ">" ">" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}") -set(PACKAGE "${APPLICATION_SHORTNAME}-client") +if (NOT DEFINED LINUX_PACKAGE_SHORTNAME) + set(LINUX_PACKAGE_SHORTNAME "${APPLICATION_SHORTNAME}") +endif() + +if (NOT DEFINED PACKAGE) + set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client") +endif() + set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) if(NOT CRASHREPORTER_EXECUTABLE) diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake index 1a818a4d0..a98c0787f 100644 --- a/OWNCLOUD.cmake +++ b/OWNCLOUD.cmake @@ -1,10 +1,13 @@ set( APPLICATION_NAME "ownCloud" ) +set( APPLICATION_SHORTNAME "ownCloud" ) set( APPLICATION_EXECUTABLE "owncloud" ) set( APPLICATION_DOMAIN "owncloud.com" ) set( APPLICATION_VENDOR "ownCloud" ) set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string "URL for updater" ) set( APPLICATION_ICON_NAME "owncloud" ) +set( LINUX_PACKAGE_SHORTNAME "owncloud" ) + set( THEME_CLASS "ownCloudTheme" ) set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" ) set( WIN_SETUP_BITMAP_PATH "${CMAKE_SOURCE_DIR}/admin/win/nsi" ) diff --git a/OwnCloudCPack.cmake b/OwnCloudCPack.cmake index cad12d1b9..39eee0080 100644 --- a/OwnCloudCPack.cmake +++ b/OwnCloudCPack.cmake @@ -48,7 +48,7 @@ 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_SHORTNAME} ) # Installation directory on the target system -> C:\Program Files\fellody + set( CPACK_PACKAGE_INSTALL_DIRECTORY ${APPLICATION_SHORTNAME} ) # Installation directory on the target system -> C:\Program Files\${APPLICATION_SHORTNAME} 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 |