[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-183-g5ac03f5

[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  5ac03f5aa179b96f3f849d584caba3e4fb7a0c13 (commit)
       via  80574a38e6cb6ac33630e878d9633f1267b53d2b (commit)
      from  f7a8a5a9753c488bb59418dff0d8f6a0f4e036a4 (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=5ac03f5aa179b96f3f849d584caba3e4fb7a0c13
commit 5ac03f5aa179b96f3f849d584caba3e4fb7a0c13
Merge: f7a8a5a 80574a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 7 09:01:25 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 7 09:01:25 2016 -0400

    Merge topic 'codelite-global-setting' into next
    
    80574a38 Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80574a38e6cb6ac33630e878d9633f1267b53d2b
commit 80574a38e6cb6ac33630e878d9633f1267b53d2b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 6 18:35:02 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 7 09:01:07 2016 -0400

    Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally

diff --git a/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst b/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
index 4aede03..33cdf6c 100644
--- a/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
+++ b/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
@@ -3,5 +3,6 @@ CMAKE_CODELITE_USE_TARGETS
 
 Change the way the CodeLite generator creates projectfiles.
 
-If this variable is set to ``ON`` the generator creates projectfiles
-based on targets rather than projects.
+If this variable evaluates to ``ON`` at the end of the top-level
+``CMakeLists.txt`` file, the generator creates projectfiles based on targets
+rather than projects.
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 629c5b6..360c852 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -60,7 +60,6 @@ void cmExtraCodeLiteGenerator::Generate()
   // loop projects and locate the root project.
   // and extract the information for creating the worspace
   // root makefile
-  const cmMakefile* rmf = CM_NULLPTR;
   for (std::map<std::string, std::vector<cmLocalGenerator*> >::const_iterator
          it = projectMap.begin();
        it != projectMap.end(); ++it) {
@@ -75,7 +74,6 @@ void cmExtraCodeLiteGenerator::Generate()
       workspaceFileName = workspaceOutputDir + "/";
       workspaceFileName += workspaceProjectName + ".workspace";
       this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();
-      rmf = it->second[0]->GetMakefile();
       ;
       break;
     }
@@ -89,7 +87,7 @@ void cmExtraCodeLiteGenerator::Generate()
   xml.Attribute("Name", workspaceProjectName);
 
   bool const targetsAreProjects =
-    rmf && rmf->IsOn("CMAKE_CODELITE_USE_TARGETS");
+    this->GlobalGenerator->GlobalSettingIsOn("CMAKE_CODELITE_USE_TARGETS");
 
   std::vector<std::string> ProjectNames;
   if (targetsAreProjects) {

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

Summary of changes:


hooks/post-receive
-- 
CMake