diff options
author | Daniel Molkentin <danimo@owncloud.com> | 2014-10-01 23:12:25 +0400 |
---|---|---|
committer | Daniel Molkentin <danimo@owncloud.com> | 2014-10-01 23:16:18 +0400 |
commit | 78d50f4033bc941d24d80ecd37119f8011994f73 (patch) | |
tree | 3ac39ac874c75d9eb0bec1d3016fa5233476a2a2 | |
parent | fee18dd4579622bb3075b5499b8ec84d7bf5efed (diff) |
CPack is still needed for Windows
This partially reverts commit dafd9c308fef47530654dccdf4d063cea24a5ba5.
This partially reverts commit 7f836cc01beb51ad62ae03ddc4feed41fac579b2.
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | OwnCloudCPack.cmake | 67 | ||||
-rw-r--r-- | cmake/modules/DeployQt5.cmake | 381 |
3 files changed, 450 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 283d22981..cdd27d331 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,6 +133,8 @@ if(BUILD_OWNCLOUD_OSX_BUNDLE) install(FILES resources/owncloud_logo_blue.png DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/) endif() +include(OwnCloudCPack.cmake) + add_definitions(-DUNICODE) add_definitions(-D_UNICODE) if( WIN32 ) diff --git a/OwnCloudCPack.cmake b/OwnCloudCPack.cmake new file mode 100644 index 000000000..fb51b7280 --- /dev/null +++ b/OwnCloudCPack.cmake @@ -0,0 +1,67 @@ +include( InstallRequiredSystemLibraries ) + +set( CPACK_PACKAGE_CONTACT "Dominik Schmidt <domme@tomahawk-player.org>" ) + +if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake ) + include ( "${OEM_THEME_DIR}/OEM.cmake" ) +else () + include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" ) +endif() + +include( VERSION.cmake ) +set( CPACK_PACKAGE_VERSION_MAJOR ${MIRALL_VERSION_MAJOR} ) +set( CPACK_PACKAGE_VERSION_MINOR ${MIRALL_VERSION_MINOR} ) +set( CPACK_PACKAGE_VERSION_PATCH ${MIRALL_VERSION_PATCH} ) +set( CPACK_PACKAGE_VERSION_BUILD ${MIRALL_VERSION_BUILD} ) +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_ICON ${CMAKE_BINARY_DIR}/src/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}") + + # 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 ) + + # do we need these? + #set( CPACK_SYSTEM_NAME "OSX" ) + #set( CPACK_PACKAGE_NAME "FOO" ) + #set( CPACK_BUNDLE_NAME "BAR" ) +endif() + + + + +if(WIN32) + set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION}-setup ) + # Package file name without extension. Also a directory of installer cmake-2.5.0-Linux-i686 + # CPACK_GENERATOR CPack generator to be used STGZ;TGZ;TZ + # CPACK_INCLUDE_TOPLEVEL_DIRECTORY Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree. 0 to disable, 1 to enable + # CPACK_INSTALL_CMAKE_PROJECTS List of four values: Build directory, Project Name, Project Component, Directory in the package /home/andy/vtk/CMake-bin;CMake;ALL;/ + 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_NAME ${APPLICATION_NAME} ) # Package name, defaults to the project name + set( CPACK_PACKAGE_VENDOR "http://${APPLICATION_DOMAIN}" ) # Package vendor name +endif() + +# set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" ) # License file for the project, used by the STGZ, NSIS, and PackageMaker generators. /home/andy/vtk/CMake/Copyright.txt + + +set( CPACK_TOPLEVEL_TAG "unused" ) # Directory for the installed files. - needed to provide anything to avoid an error# CPACK_INSTALL_COMMANDS Extra commands to install components. + + +# Set the options file that needs to be included inside CMakeCPackOptions.cmake +configure_file("${CMAKE_SOURCE_DIR}/CPackOptions.cmake.in" + "${CMAKE_BINARY_DIR}/CPackOptions.cmake" @ONLY) +set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackOptions.cmake") # File included at cpack time, once per generator after setting CPACK_GENERATOR to the actual generator being used; allows per-generator setting of CPACK_* variables at cpack time. ${PROJECT_BINARY_DIR}/CPackOptions.cmake +include(CPack) diff --git a/cmake/modules/DeployQt5.cmake b/cmake/modules/DeployQt5.cmake new file mode 100644 index 000000000..b9e5d7029 --- /dev/null +++ b/cmake/modules/DeployQt5.cmake @@ -0,0 +1,381 @@ +# - Functions to help assemble a standalone Qt5 executable. +# A collection of CMake utility functions useful for deploying +# Qt5 executables. +# +# The following functions are provided by this module: +# write_qt5_conf +# resolve_qt5_paths +# fixup_qt5_executable +# install_qt5_plugin_path +# install_qt5_plugin +# install_qt5_executable +# Requires CMake 2.6 or greater because it uses function and +# PARENT_SCOPE. Also depends on BundleUtilities.cmake. +# +# WRITE_QT5_CONF(<qt_conf_dir> <qt_conf_contents>) +# Writes a qt.conf file with the <qt_conf_contents> into <qt_conf_dir>. +# +# RESOLVE_QT5_PATHS(<paths_var> [<executable_path>]) +# Loop through <paths_var> list and if any don't exist resolve them +# relative to the <executable_path> (if supplied) or the CMAKE_INSTALL_PREFIX. +# +# FIXUP_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf>]) +# Copies Qt plugins, writes a Qt configuration file (if needed) and fixes up a +# Qt5 executable using BundleUtilities so it is standalone and can be +# drag-and-drop copied to another machine as long as all of the system +# libraries are compatible. +# +# <executable> should point to the executable to be fixed-up. +# +# <qtplugins> should contain a list of the names or paths of any Qt plugins +# to be installed. +# +# <libs> will be passed to BundleUtilities and should be a list of any already +# installed plugins, libraries or executables to also be fixed-up. +# +# <dirs> will be passed to BundleUtilities and should contain and directories +# to be searched to find library dependencies. +# +# <plugins_dir> allows an custom plugins directory to be used. +# +# <request_qt_conf> will force a qt.conf file to be written even if not needed. +# +# INSTALL_QT5_PLUGIN_PATH(plugin executable copy installed_plugin_path_var <plugins_dir> <component> <configurations>) +# Install (or copy) a resolved <plugin> to the default plugins directory +# (or <plugins_dir>) relative to <executable> and store the result in +# <installed_plugin_path_var>. +# +# If <copy> is set to TRUE then the plugins will be copied rather than +# installed. This is to allow this module to be used at CMake time rather than +# install time. +# +# If <component> is set then anything installed will use this COMPONENT. +# +# INSTALL_QT5_PLUGIN(plugin executable copy installed_plugin_path_var <plugins_dir> <component>) +# Install (or copy) an unresolved <plugin> to the default plugins directory +# (or <plugins_dir>) relative to <executable> and store the result in +# <installed_plugin_path_var>. See documentation of INSTALL_QT5_PLUGIN_PATH. +# +# INSTALL_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf> <component>]) +# Installs Qt plugins, writes a Qt configuration file (if needed) and fixes up +# a Qt5 executable using BundleUtilities so it is standalone and can be +# drag-and-drop copied to another machine as long as all of the system +# libraries are compatible. The executable will be fixed-up at install time. +# <component> is the COMPONENT used for bundle fixup and plugin installation. +# See documentation of FIXUP_QT5_BUNDLE. + +#============================================================================= +# Copyright 2011 Mike McQuaid <m...@mikemcquaid.com> +# Copyright 2013 Mihai Moldovan <io...@ionic.de> +# CMake - Cross Platform Makefile Generator +# Copyright 2000-2011 Kitware, Inc., Insight Software Consortium +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the names of Kitware, Inc., the Insight Software Consortium, +# nor the names of their contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# The functions defined in this file depend on the fixup_bundle function +# (and others) found in BundleUtilities.cmake + +include(BundleUtilities) +set(DeployQt5_cmake_dir "${CMAKE_CURRENT_LIST_DIR}") +set(DeployQt5_apple_plugins_dir "PlugIns") + +function(write_qt5_conf qt_conf_dir qt_conf_contents) + set(qt_conf_path "${qt_conf_dir}/qt.conf") + message(STATUS "Writing ${qt_conf_path}") + file(WRITE "${qt_conf_path}" "${qt_conf_contents}") +endfunction() + +function(resolve_qt5_paths paths_var) + set(executable_path ${ARGV1}) + + set(paths_resolved) + foreach(path ${${paths_var}}) + if(EXISTS "${path}") + list(APPEND paths_resolved "${path}") + else() + if(${executable_path}) + list(APPEND paths_resolved +"${executable_path}/${path}") + else() + list(APPEND paths_resolved +"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${path}") + endif() + endif() + endforeach() + set(${paths_var} ${paths_resolved} PARENT_SCOPE) +endfunction() + +function(fixup_qt5_executable executable) + set(qtplugins ${ARGV1}) + set(libs ${ARGV2}) + set(dirs ${ARGV3}) + set(plugins_dir ${ARGV4}) + set(request_qt_conf ${ARGV5}) + + message(STATUS "fixup_qt5_executable") + message(STATUS " executable='${executable}'") + message(STATUS " qtplugins='${qtplugins}'") + message(STATUS " libs='${libs}'") + message(STATUS " dirs='${dirs}'") + message(STATUS " plugins_dir='${plugins_dir}'") + message(STATUS " request_qt_conf='${request_qt_conf}'") + + if(QT_LIBRARY_DIR) + list(APPEND dirs "${QT_LIBRARY_DIR}") + endif() + if(QT_BINARY_DIR) + list(APPEND dirs "${QT_BINARY_DIR}") + endif() + + if(APPLE) + set(qt_conf_dir "${executable}/Contents/Resources") + set(executable_path "${executable}") + set(write_qt_conf TRUE) + if(NOT plugins_dir) + set(plugins_dir "${DeployQt5_apple_plugins_dir}") + endif() + else() + get_filename_component(executable_path "${executable}" PATH) + if(NOT executable_path) + set(executable_path ".") + endif() + set(qt_conf_dir "${executable_path}") + set(write_qt_conf ${request_qt_conf}) + endif() + + foreach(plugin ${qtplugins}) + set(installed_plugin_path "") + install_qt5_plugin("${plugin}" "${executable}" 1 +installed_plugin_path) + list(APPEND libs ${installed_plugin_path}) + endforeach() + + foreach(lib ${libs}) + if(NOT EXISTS "${lib}") + message(FATAL_ERROR "Library does not exist: ${lib}") + endif() + endforeach() + + resolve_qt5_paths(libs "${executable_path}") + + if(write_qt_conf) + set(qt_conf_contents "[Paths]\nPlugins = ${plugins_dir}") + write_qt5_conf("${qt_conf_dir}" "${qt_conf_contents}") + endif() + + fixup_bundle("${executable}" "${libs}" "${dirs}") +endfunction() + +function(install_qt5_plugin_path plugin executable copy +installed_plugin_path_var) + set(plugins_dir ${ARGV4}) + set(component ${ARGV5}) + set(configurations ${ARGV6}) + if(EXISTS "${plugin}") + if(APPLE) + if(NOT plugins_dir) + set(plugins_dir +"${DeployQt5_apple_plugins_dir}") + endif() + set(plugins_path +"${executable}/Contents/${plugins_dir}") + else() + get_filename_component(plugins_path "${executable}" +PATH) + if(NOT plugins_path) + set(plugins_path ".") + endif() + if(plugins_dir) + set(plugins_path +"${plugins_path}/${plugins_dir}") + endif() + endif() + + set(plugin_group "") + + get_filename_component(plugin_path "${plugin}" PATH) + get_filename_component(plugin_parent_path "${plugin_path}" PATH) + get_filename_component(plugin_parent_dir_name +"${plugin_parent_path}" NAME) + get_filename_component(plugin_name "${plugin}" NAME) + string(TOLOWER "${plugin_parent_dir_name}" +plugin_parent_dir_name) + + if("${plugin_parent_dir_name}" STREQUAL "plugins") + get_filename_component(plugin_group "${plugin_path}" +NAME) + set(${plugin_group_var} "${plugin_group}") + endif() + set(plugins_path "${plugins_path}/${plugin_group}") + + if(${copy}) + file(MAKE_DIRECTORY "${plugins_path}") + file(COPY "${plugin}" DESTINATION "${plugins_path}") + else() + if(configurations AND (CMAKE_CONFIGURATION_TYPES OR +CMAKE_BUILD_TYPE)) + set(configurations CONFIGURATIONS +${configurations}) + else() + unset(configurations) + endif() + install(FILES "${plugin}" DESTINATION "${plugins_path}" +${configurations} ${component}) + endif() + set(${installed_plugin_path_var} +"${plugins_path}/${plugin_name}" PARENT_SCOPE) + endif() +endfunction() + +function(install_qt5_plugin plugin executable copy installed_plugin_path_var) + set(plugins_dir ${ARGV4}) + set(component ${ARGV5}) + if(EXISTS "${plugin}") + install_qt5_plugin_path("${plugin}" "${executable}" "${copy}" +"${installed_plugin_path_var}" "${plugins_dir}" "${component}") + else() + #string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var) + set(plugin_release) + set(plugin_debug) + set(plugin_tmp_path) + set(plugin_find_path "${Qt5Core_DIR}/../../../plugins/") + get_filename_component(plugin_find_path "${plugin_find_path}" +REALPATH) + set(plugin_find_release_filename "lib${plugin}.dylib") + set(plugin_find_debug_filename "lib${plugin}_debug.dylib") + file(GLOB_RECURSE pluginlist "${plugin_find_path}" +"${plugin_find_path}/*/lib*.dylib") + foreach(found_plugin ${pluginlist}) + get_filename_component(curname "${found_plugin}" NAME) + if("${curname}" STREQUAL "${plugin_find_release_filename}") + set(plugin_tmp_release_path "${found_plugin}") + endif() + if("${curname}" STREQUAL "${plugin_find_debug_filename}") + set(plugin_tmp_debug_path "${found_plugin}") + endif() + endforeach() + + if((NOT DEFINED plugin_tmp_release_path OR NOT EXISTS +"${plugin_tmp_release_path}") AND (NOT DEFINED plugin_tmp_debug_PATH OR NOT +EXISTS "${plugin_tmp_debug_path}")) + message(WARNING "Qt plugin \"${plugin}\" not recognized +or found.") + endif() + + if(EXISTS "${plugin_tmp_release_path}") + set(plugin_release "${plugin_tmp_release_path}") + elseif(EXISTS "${plugin_tmp_debug_path}") + set(plugin_release "${plugin_tmp_debug_path}") + endif() + + if(EXISTS "${plugin_tmp_debug_path}") + set(plugin_debug "${plugin_tmp_debug_path}") + elseif(EXISTS "${plugin_tmp_release_path}") + set(plugin_debug "${plugin_tmp_release_path}") + endif() + + if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) + install_qt5_plugin_path("${plugin_release}" +"${executable}" "${copy}" "${installed_plugin_path_var}_release" +"${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel") + install_qt5_plugin_path("${plugin_debug}" +"${executable}" "${copy}" "${installed_plugin_path_var}_debug" "${plugins_dir}" +"${component}" "Debug") + + if(CMAKE_BUILD_TYPE MATCHES "^Debug$") + set(${installed_plugin_path_var} +${${installed_plugin_path_var}_debug}) + else() + set(${installed_plugin_path_var} +${${installed_plugin_path_var}_release}) + endif() + else() + install_qt5_plugin_path("${plugin_release}" +"${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" +"${component}") + endif() + endif() + set(${installed_plugin_path_var} ${${installed_plugin_path_var}} +PARENT_SCOPE) +endfunction() + +function(install_qt5_executable executable) + set(qtplugins ${ARGV1}) + set(libs ${ARGV2}) + set(dirs ${ARGV3}) + set(plugins_dir ${ARGV4}) + set(request_qt_conf ${ARGV5}) + set(component ${ARGV6}) + if(QT_LIBRARY_DIR) + list(APPEND dirs "${QT_LIBRARY_DIR}") + endif() + if(QT_BINARY_DIR) + list(APPEND dirs "${QT_BINARY_DIR}") + endif() + if(component) + set(component COMPONENT ${component}) + else() + unset(component) + endif() + + get_filename_component(executable_absolute "${executable}" ABSOLUTE) + if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}") + gp_file_type("${executable_absolute}" +"${QT_QTCORE_LIBRARY_RELEASE}" qtcore_type) + elseif(EXISTS "${QT_QTCORE_LIBRARY_DEBUG}") + gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_DEBUG}" +qtcore_type) + endif() + if(qtcore_type STREQUAL "system") + set(qt_plugins_dir "") + endif() + + if(QT_IS_STATIC) + message(WARNING "Qt built statically: not installing plugins.") + else() + foreach(plugin ${qtplugins}) + message(STATUS "trying to install plugin ${plugin}") + set(installed_plugin_paths "") + install_qt5_plugin("${plugin}" "${executable}" 0 +installed_plugin_paths "${plugins_dir}" "${component}") + list(APPEND libs ${installed_plugin_paths}) + endforeach() + endif() + + resolve_qt5_paths(libs "") + + install(CODE + "include(\"${DeployQt5_cmake_dir}/DeployQt5.cmake\") + set(BU_CHMOD_BUNDLE_ITEMS TRUE) + FIXUP_QT5_EXECUTABLE(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${executable}\" +\"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")" + ${component} + ) +endfunction() |