[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-313-g479b0e2

[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  479b0e2175da23aa995c19cc03d2abbfae1ea551 (commit)
       via  c637e0c53b5b81d6605018bd64ea2769f356662a (commit)
       via  fbc1b75c2692d82f729359b0aeec7ad959662d54 (commit)
       via  3d0e95f64c996d3d54b387f7688f988dd843ac6a (commit)
      from  a27be19f9c4990e97310c1fbf0005aaaf9bbf40e (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=479b0e2175da23aa995c19cc03d2abbfae1ea551
commit 479b0e2175da23aa995c19cc03d2abbfae1ea551
Merge: a27be19 c637e0c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 10 10:10:06 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 10 10:10:06 2016 -0400

    Merge topic 'minor-cleanups' into next
    
    c637e0c5 cmMakefile: Return a string from GetDefineFlags
    fbc1b75c Test: Remove condition for CMake version no longer supported
    3d0e95f6 cmLocalGenerator: Extract definition retrieval out of loop


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c637e0c53b5b81d6605018bd64ea2769f356662a
commit c637e0c53b5b81d6605018bd64ea2769f356662a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 9 10:47:45 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 10 10:09:54 2016 -0400

    cmMakefile: Return a string from GetDefineFlags
    
    Flip condition in GHS for readability.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 959dfdb..fac68f5 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -244,7 +244,7 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const& config,
       flags, this->GeneratorTarget, lang);
 
     // Append old-style preprocessor definition flags.
-    if (std::string(" ") != std::string(this->Makefile->GetDefineFlags())) {
+    if (this->Makefile->GetDefineFlags() != " ") {
       this->LocalGenerator->AppendFlags(flags,
                                         this->Makefile->GetDefineFlags());
     }
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 40344ce..de7bead 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -447,7 +447,7 @@ public:
   /**
    * Get a list of preprocessor define flags.
    */
-  const char* GetDefineFlags() const { return this->DefineFlags.c_str(); }
+  std::string GetDefineFlags() const { return this->DefineFlags; }
 
   /**
    * Make sure CMake can write this file

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbc1b75c2692d82f729359b0aeec7ad959662d54
commit fbc1b75c2692d82f729359b0aeec7ad959662d54
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 9 10:47:44 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 10 10:09:54 2016 -0400

    Test: Remove condition for CMake version no longer supported

diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index 56fcc5d..23832da 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -20,16 +20,9 @@ if(UNIX  AND  "${CMAKE_GENERATOR}" MATCHES "Makefile" AND
     configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake @ONLY)
 
     # now set up the test:
-    if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
-      file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
-        CONTENT "CMAKE = \"$<TARGET_FILE:cmake>\"\n"
-      )
-    else()
-      get_target_property(cmakeLocation cmake LOCATION)
-      file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
-        "CMAKE = \"${cmakeLocation}\"\n"
-      )
-    endif()
+    file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
+      CONTENT "CMAKE = \"$<TARGET_FILE:cmake>\"\n"
+    )
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in ${CMAKE_CURRENT_BINARY_DIR}/ConfMakefile @ONLY)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_BINARY_DIR}/main.cpp COPYONLY)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d0e95f64c996d3d54b387f7688f988dd843ac6a
commit 3d0e95f64c996d3d54b387f7688f988dd843ac6a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 9 10:47:44 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 10 10:09:54 2016 -0400

    cmLocalGenerator: Extract definition retrieval out of loop

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2284cf9..025b82a 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1176,12 +1176,13 @@ void cmLocalGenerator::GetTargetFlags(
           !(this->Makefile->IsOn("CYGWIN") || this->Makefile->IsOn("MINGW"))) {
         std::vector<cmSourceFile*> sources;
         target->GetSourceFiles(sources, buildType);
+        std::string defFlag =
+          this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
         for (std::vector<cmSourceFile*>::const_iterator i = sources.begin();
              i != sources.end(); ++i) {
           cmSourceFile* sf = *i;
           if (sf->GetExtension() == "def") {
-            linkFlags +=
-              this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
+            linkFlags += defFlag;
             linkFlags += this->ConvertToOutputFormat(
               cmSystemTools::CollapseFullPath(sf->GetFullPath()), SHELL);
             linkFlags += " ";

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

Summary of changes:


hooks/post-receive
-- 
CMake