[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6400-gdf72653

[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  df72653f18191723a1e4ee2407761195eb3f3ee6 (commit)
       via  55c6e3a1dd98b2525b7064d692f34eb4cfd351dd (commit)
      from  e8e1a419a2a6a84cab48561ac8543c55ec85ff82 (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=df72653f18191723a1e4ee2407761195eb3f3ee6
commit df72653f18191723a1e4ee2407761195eb3f3ee6
Merge: e8e1a41 55c6e3a
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Dec 25 16:14:50 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 25 16:14:50 2013 -0500

    Merge topic 'optional-install' into next
    
    55c6e3a InstallRules: added new variable to disable generation of install rules


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55c6e3a1dd98b2525b7064d692f34eb4cfd351dd
commit 55c6e3a1dd98b2525b7064d692f34eb4cfd351dd
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 22:14:11 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..1cbdf8e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1172,7 +1172,11 @@ void cmGlobalGenerator::Generate()
     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 +2244,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:


hooks/post-receive
-- 
CMake