[Cmake-commits] CMake branch, next, updated. v3.8.0-782-gac39cc9

Kitware Robot kwrobot at kitware.com
Mon Apr 17 15:35:05 EDT 2017


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  ac39cc96d0b4a95c37fbb7b95ed06d7d781e9e04 (commit)
       via  470437f6f93fb7c26afd38176a9779505c7922e5 (commit)
      from  681c8bc4babcbd5d817c786474e0084c3034de4f (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac39cc96d0b4a95c37fbb7b95ed06d7d781e9e04
commit ac39cc96d0b4a95c37fbb7b95ed06d7d781e9e04
Merge: 681c8bc 470437f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 17 19:34:21 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Apr 17 15:34:25 2017 -0400

    Stage topic 'ipo-var-per-config'
    
    Topic-id: 23698
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/709


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=470437f6f93fb7c26afd38176a9779505c7922e5
commit 470437f6f93fb7c26afd38176a9779505c7922e5
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Sun Apr 16 10:24:08 2017 +0800
Commit:     Ruslan Baratov <ruslan_baratov at yahoo.com>
CommitDate: Tue Apr 18 03:10:34 2017 +0800

    Support CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG>

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 0a68815..7347bcc 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -292,6 +292,7 @@ Variables that Control the Build
    /variable/CMAKE_INSTALL_RPATH
    /variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH
    /variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION
+   /variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG
    /variable/CMAKE_IOS_INSTALL_COMBINED
    /variable/CMAKE_LANG_CLANG_TIDY
    /variable/CMAKE_LANG_COMPILER_LAUNCHER
diff --git a/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst b/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
index 492fee0..782b0f0 100644
--- a/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
+++ b/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
@@ -6,3 +6,7 @@ Per-configuration interprocedural optimization for a target.
 This is a per-configuration version of INTERPROCEDURAL_OPTIMIZATION.
 If set, this property overrides the generic property for the named
 configuration.
+
+This property is initialized by the
+:variable:`CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG>` variable if it is set
+when a target is created.
diff --git a/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst b/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
new file mode 100644
index 0000000..b291102
--- /dev/null
+++ b/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
@@ -0,0 +1,8 @@
+CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG>
+-------------------------------------------
+
+Default value for :prop_tgt:`INTERPROCEDURAL_OPTIMIZATION_<CONFIG>` of targets.
+
+This variable is used to initialize the :prop_tgt:`INTERPROCEDURAL_OPTIMIZATION_<CONFIG>`
+property on all the targets.  See that target property for additional
+information.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index d29a8bd..f297988 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -291,13 +291,10 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
   if (this->GetType() != cmStateEnums::UTILITY) {
     const char* configProps[] = {
       /* clang-format needs this comment to break after the opening brace */
-      "ARCHIVE_OUTPUT_DIRECTORY_",
-      "LIBRARY_OUTPUT_DIRECTORY_",
-      "RUNTIME_OUTPUT_DIRECTORY_",
-      "PDB_OUTPUT_DIRECTORY_",
-      "COMPILE_PDB_OUTPUT_DIRECTORY_",
-      "MAP_IMPORTED_CONFIG_",
-      CM_NULLPTR
+      "ARCHIVE_OUTPUT_DIRECTORY_",     "LIBRARY_OUTPUT_DIRECTORY_",
+      "RUNTIME_OUTPUT_DIRECTORY_",     "PDB_OUTPUT_DIRECTORY_",
+      "COMPILE_PDB_OUTPUT_DIRECTORY_", "MAP_IMPORTED_CONFIG_",
+      "INTERPROCEDURAL_OPTIMIZATION_", CM_NULLPTR
     };
     for (std::vector<std::string>::iterator ci = configNames.begin();
          ci != configNames.end(); ++ci) {

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

Summary of changes:
 Help/manual/cmake-variables.7.rst                           |    1 +
 Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst       |    4 ++++
 Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst |    8 ++++++++
 Source/cmTarget.cxx                                         |   11 ++++-------
 4 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list