kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmake-install-dependencies-option' 

068e7962 CMake: Add CMake_INSTALL_DEPENDENCIES option
This commit is contained in:
Brad King 2015-07-28 10:08:44 -04:00 committed by CMake Topic Stage
parent be938ab3f8 068e7962bb
commit eb2b23e0d9
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeCPack.cmake
View File

@ -22,8 +22,10 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON) set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
endif() endif()
if(CMake_INSTALL_DEPENDENCIES)
include(${CMake_SOURCE_DIR}/Modules/InstallRequiredSystemLibraries.cmake) include(${CMake_SOURCE_DIR}/Modules/InstallRequiredSystemLibraries.cmake)
endif() endif()
endif()
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake is a build tool") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake is a build tool")
set(CPACK_PACKAGE_VENDOR "Kitware") set(CPACK_PACKAGE_VENDOR "Kitware")

5
CMakeLists.txt
View File

@ -70,6 +70,11 @@ macro(CMake_OPTIONAL_COMPONENT NAME)
endif() endif()
endmacro() endmacro()
# option to disable installing 3rd-party dependencies
option(CMake_INSTALL_DEPENDENCIES
"Whether to install 3rd-party runtime dependencies" ON)
mark_as_advanced(CMake_INSTALL_DEPENDENCIES)
#----------------------------------------------------------------------- #-----------------------------------------------------------------------
# a macro to deal with system libraries, implemented as a macro # a macro to deal with system libraries, implemented as a macro
# simply to improve readability of the main script # simply to improve readability of the main script

4
Source/QtDialog/CMakeLists.txt
View File

@ -39,7 +39,7 @@ if (Qt5Widgets_FOUND)
# We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows. # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
# FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
# Qt5 support is missing there. # Qt5 support is missing there.
if(APPLE OR WIN32) if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var) macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)
get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION) get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
if(EXISTS "${_qt_plugin_path}") if(EXISTS "${_qt_plugin_path}")
@ -213,7 +213,7 @@ if(APPLE)
" ${COMPONENT}) " ${COMPONENT})
endif() endif()
if(APPLE OR WIN32) if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
# install rules for including 3rd party libs such as Qt # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}") set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")