[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6396-g295cd32

[Nils Gladitz]

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  295cd323cca0537c2ca743616a600f9636b2a81e (commit)
       via  5a8dc975c01c862546d94f94f1273fcbd0802d14 (commit)
       via  b87ce492ab4600091262593499095ea5db1ae0ca (commit)
       via  dfbca3b42a58a894a6bd0ad08c797b9d699da40d (commit)
      from  afbbd31b8ad6fdeb5e64850bba5ca000c9adffa7 (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=295cd323cca0537c2ca743616a600f9636b2a81e
commit 295cd323cca0537c2ca743616a600f9636b2a81e
Merge: afbbd31 5a8dc97
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Dec 25 15:56:29 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 25 15:56:29 2013 -0500

    Merge topic 'optional-install' into next
    
    5a8dc97 InstallRules: added new variable to disable generation of install rules
    b87ce49 CMake Nightly Date Stamp
    dfbca3b CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a8dc975c01c862546d94f94f1273fcbd0802d14
commit 5a8dc975c01c862546d94f94f1273fcbd0802d14
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Dec 25 17:59:24 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Dec 25 19:14:31 2013 +0100

    InstallRules: added new variable to disable generation of install rules
    
    The boolean variable CMAKE_DISABLE_INSTALL_RULES
    allows disabling generation of install rules for projects which don't
    want them.

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index d86db37..2753bdd 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -31,6 +31,7 @@ Variables that Provide Information
    /variable/CMAKE_CURRENT_LIST_FILE
    /variable/CMAKE_CURRENT_LIST_LINE
    /variable/CMAKE_CURRENT_SOURCE_DIR
+   /variable/CMAKE_DISABLE_INSTALL_RULES
    /variable/CMAKE_DL_LIBS
    /variable/CMAKE_EDIT_COMMAND
    /variable/CMAKE_EXECUTABLE_SUFFIX
diff --git a/Help/variable/CMAKE_DISABLE_INSTALL_RULES.rst b/Help/variable/CMAKE_DISABLE_INSTALL_RULES.rst
new file mode 100644
index 0000000..1a9f2c1
--- /dev/null
+++ b/Help/variable/CMAKE_DISABLE_INSTALL_RULES.rst
@@ -0,0 +1,7 @@
+CMAKE_DISABLE_INSTALL_RULES
+---------------------------
+
+Whether to disable generation of installation rules.
+
+If TRUE, cmake will neither generate installaton rules nor
+will it generate cmake_install.cmake files. This variable is FALSE by default.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 227a948..b92a7f6 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1166,13 +1166,18 @@ void cmGlobalGenerator::Generate()
       }
     }
 
+
   // Generate project files
   for (i = 0; i < this->LocalGenerators.size(); ++i)
     {
     this->LocalGenerators[i]->GetMakefile()->SetGeneratingBuildSystem();
     this->SetCurrentLocalGenerator(this->LocalGenerators[i]);
     this->LocalGenerators[i]->Generate();
-    this->LocalGenerators[i]->GenerateInstallRules();
+    if(!this->LocalGenerators[i]->GetMakefile()->IsOn(
+      "CMAKE_DISABLE_INSTALL_RULES"))
+      {
+      this->LocalGenerators[i]->GenerateInstallRules();
+      }
     this->LocalGenerators[i]->GenerateTestFiles();
     this->CMakeInstance->UpdateProgress("Generating",
       (static_cast<float>(i)+1.0f)/
@@ -2240,7 +2245,14 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
     }
 
   //Install
-  if(this->InstallTargetEnabled)
+  bool disableInstallRules = mf->IsOn("CMAKE_DISABLE_INSTALL_RULES");
+  if(this->InstallTargetEnabled && disableInstallRules)
+    {
+    mf->IssueMessage(cmake::WARNING,
+      "CMAKE_DISABLE_INSTALL_RULES was enabled even though "
+      "installation rules have been specified");
+    }
+  else if(this->InstallTargetEnabled && !disableInstallRules)
     {
     if(!cmakeCfgIntDir || !*cmakeCfgIntDir || cmakeCfgIntDir[0] == '.')
       {

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

Summary of changes:
 Help/manual/cmake-variables.7.rst             |    1 +
 Help/variable/CMAKE_DISABLE_INSTALL_RULES.rst |    7 +++++++
 Source/CMakeVersion.cmake                     |    2 +-
 Source/cmGlobalGenerator.cxx                  |   16 ++++++++++++++--
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 Help/variable/CMAKE_DISABLE_INSTALL_RULES.rst


hooks/post-receive
-- 
CMake