[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-833-gf26b6a1
Brad King
brad.king at kitware.com
Tue Mar 3 09:21:00 EST 2015
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 f26b6a12367b7626d332499b418151338cb751da (commit)
via e97141c2bc11d1cda3adc2579eeab53620d3b921 (commit)
via d6a320ab5ef12459b98fae2711b9a386b4a01466 (commit)
from bce2428ee4f1634bf32ff23666f14177334dfdb6 (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=f26b6a12367b7626d332499b418151338cb751da
commit f26b6a12367b7626d332499b418151338cb751da
Merge: bce2428 e97141c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 3 09:20:59 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 3 09:20:59 2015 -0500
Merge topic 'InstallRequiredSystemLibraries-COMPONENT' into next
e97141c2 InstallRequiredSystemLibraries: Add option to specify install COMPONENT
d6a320ab InstallRequiredSystemLibraries: Format documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e97141c2bc11d1cda3adc2579eeab53620d3b921
commit e97141c2bc11d1cda3adc2579eeab53620d3b921
Author: Johan Andruejol <johan.andruejol at kitware.com>
AuthorDate: Mon Mar 2 14:28:14 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 3 09:17:47 2015 -0500
InstallRequiredSystemLibraries: Add option to specify install COMPONENT
Previously the module did not support projects using installation
components because install(PROGRAMS) was never called with COMPONENT.
Add an option to specify the COMPONENT so that projects doing this do
not have to resort to using CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP and
writing the install rule by hand.
diff --git a/Help/release/dev/InstallRequiredSystemLibraries-COMPONENT.rst b/Help/release/dev/InstallRequiredSystemLibraries-COMPONENT.rst
new file mode 100644
index 0000000..e6ebc2d
--- /dev/null
+++ b/Help/release/dev/InstallRequiredSystemLibraries-COMPONENT.rst
@@ -0,0 +1,6 @@
+InstallRequiredSystemLibraries-COMPONENT
+----------------------------------------
+
+* The :module:`InstallRequiredSystemLibraries` module learned a new
+ ``CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT`` option to specify the
+ installation component.
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index bd7f5b2..c7e88ba 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -38,9 +38,13 @@
# Set to TRUE to disable warnings about required library files that
# do not exist. (For example, Visual Studio Express editions may
# not provide the redistributable files.)
+#
+# ``CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT``
+# Specify the :command:`install(PROGRAMS)` command ``COMPONENT``
+# option. If not specified, no such option will be used.
#=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006-2015 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -486,7 +490,13 @@ if(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION lib)
endif()
endif()
+ if(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT)
+ set(_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT
+ COMPONENT ${CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT})
+ endif()
install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
- DESTINATION ${CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION})
+ DESTINATION ${CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION}
+ ${_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT}
+ )
endif()
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6a320ab5ef12459b98fae2711b9a386b4a01466
commit d6a320ab5ef12459b98fae2711b9a386b4a01466
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 3 09:14:29 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 3 09:14:29 2015 -0500
InstallRequiredSystemLibraries: Format documentation
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 5afb517..bd7f5b2 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -2,33 +2,42 @@
# InstallRequiredSystemLibraries
# ------------------------------
#
+# Include this module to search for compiler-provided system runtime
+# libraries and add install rules for them. Some optional variables
+# may be set prior to including the module to adjust behavior:
#
+# ``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS``
+# Specify additional runtime libraries that may not be detected.
+# After inclusion any detected libraries will be appended to this.
#
-# By including this file, all library files listed in the variable
-# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS will be installed with
-# install(PROGRAMS ...) into bin for WIN32 and lib for non-WIN32. If
-# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP is set to TRUE before including
-# this file, then the INSTALL command is not called. The user can use
-# the variable CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS to use a custom install
-# command and install them however they want. If it is the MSVC
-# compiler, then the microsoft run time libraries will be found and
-# automatically added to the CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS, and
-# installed. If CMAKE_INSTALL_DEBUG_LIBRARIES is set and it is the MSVC
-# compiler, then the debug libraries are installed when available. If
-# CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY is set then only the debug
-# libraries are installed when both debug and release are available. If
-# CMAKE_INSTALL_MFC_LIBRARIES is set then the MFC run time libraries are
-# installed as well as the CRT run time libraries. If
-# CMAKE_INSTALL_OPENMP_LIBRARIES is set then the OpenMP run time libraries
-# are installed as well. If
-# CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION is set then the libraries are
-# installed to that directory rather than the default. If
-# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS is NOT set, then this
-# file warns about required files that do not exist. You can set this
-# variable to ON before including this file to avoid the warning. For
-# example, the Visual Studio Express editions do not include the
-# redistributable files, so if you include this file on a machine with
-# only VS Express installed, you'll get the warning.
+# ``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP``
+# Set to TRUE to skip calling the :command:`install(PROGRAMS)` command to
+# allow the includer to specify its own install rule, using the value of
+# ``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS`` to get the list of libraries.
+#
+# ``CMAKE_INSTALL_DEBUG_LIBRARIES``
+# Set to TRUE to install the debug runtime libraries when available
+# with MSVC tools.
+#
+# ``CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY``
+# Set to TRUE to install only the debug runtime libraries with MSVC
+# tools even if the release runtime libraries are also available.
+#
+# ``CMAKE_INSTALL_MFC_LIBRARIES``
+# Set to TRUE to install the MSVC MFC runtime libraries.
+#
+# ``CMAKE_INSTALL_OPENMP_LIBRARIES``
+# Set to TRUE to install the MSVC OpenMP runtime libraries
+#
+# ``CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION``
+# Specify the :command:`install(PROGRAMS)` command ``DESTINATION``
+# option. If not specified, the default is ``bin`` on Windows
+# and ``lib`` elsewhere.
+#
+# ``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS``
+# Set to TRUE to disable warnings about required library files that
+# do not exist. (For example, Visual Studio Express editions may
+# not provide the redistributable files.)
#=============================================================================
# Copyright 2006-2009 Kitware, Inc.
-----------------------------------------------------------------------
Summary of changes:
.../InstallRequiredSystemLibraries-COMPONENT.rst | 6 ++
Modules/InstallRequiredSystemLibraries.cmake | 73 ++++++++++++--------
2 files changed, 52 insertions(+), 27 deletions(-)
create mode 100644 Help/release/dev/InstallRequiredSystemLibraries-COMPONENT.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list