[Cmake-commits] CMake branch, next, updated. v3.3.0-1413-gb219cce

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b219cce55112593e4701cc6a159ed35db0cbbfb1 (commit)
       via  068e7962bb8a90ae9ae6b7d6da520a70701820af (commit)
      from  976fbac9dc99fb4657254c33243013c83929b220 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b219cce55112593e4701cc6a159ed35db0cbbfb1
commit b219cce55112593e4701cc6a159ed35db0cbbfb1
Merge: 976fbac 068e796
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 27 11:03:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 27 11:03:53 2015 -0400

    Merge topic 'cmake-install-dependencies-option' into next
    
    068e7962 CMake: Add CMake_INSTALL_DEPENDENCIES option


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=068e7962bb8a90ae9ae6b7d6da520a70701820af
commit 068e7962bb8a90ae9ae6b7d6da520a70701820af
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Fri Jul 24 10:15:06 2015 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 27 10:30:41 2015 -0400

    CMake: Add CMake_INSTALL_DEPENDENCIES option
    
    By default this option is ON.  Turn OFF to disable installing runtime
    3rd-party dependencies.

diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index ce10ad0..a0aadcc 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -22,7 +22,9 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
       set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
     endif()
 
-    include(${CMake_SOURCE_DIR}/Modules/InstallRequiredSystemLibraries.cmake)
+    if(CMake_INSTALL_DEPENDENCIES)
+      include(${CMake_SOURCE_DIR}/Modules/InstallRequiredSystemLibraries.cmake)
+    endif()
   endif()
 
   set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake is a build tool")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e94028..a47c2ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,11 @@ macro(CMake_OPTIONAL_COMPONENT NAME)
   endif()
 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
 # simply to improve readability of the main script
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index ba993eb..ad6a7fb 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -39,7 +39,7 @@ if (Qt5Widgets_FOUND)
   # 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
   # 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)
       get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
       if(EXISTS "${_qt_plugin_path}")
@@ -213,7 +213,7 @@ if(APPLE)
   " ${COMPONENT})
 endif()
 
-if(APPLE OR WIN32)
+if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
   # 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
   set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")

-----------------------------------------------------------------------

Summary of changes:
 CMakeCPack.cmake               |    4 +++-
 CMakeLists.txt                 |    5 +++++
 Source/QtDialog/CMakeLists.txt |    4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake