[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3057-gcd972d0

[Stephen Kelly]

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  cd972d068c2b36f34d34b8dac3b4ca6d03d9036e (commit)
       via  86707de68053def28c7a030b64eef42d8969e616 (commit)
      from  5bd941d8989d869509eae108a6b01b4f10f882a3 (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=cd972d068c2b36f34d34b8dac3b4ca6d03d9036e
commit cd972d068c2b36f34d34b8dac3b4ca6d03d9036e
Merge: 5bd941d 86707de
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 12 09:43:57 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 12 09:43:57 2013 -0400

    Merge topic 'replace-CMAKE_SYSROOT_FLAG' into next
    
    86707de Revert "Replace CMAKE_SYSROOT_FLAG with a lang specific COMPILE_OPTION."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86707de68053def28c7a030b64eef42d8969e616
commit 86707de68053def28c7a030b64eef42d8969e616
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 12 15:43:25 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 12 15:43:25 2013 +0200

    Revert "Replace CMAKE_SYSROOT_FLAG with a lang specific COMPILE_OPTION."
    
    This reverts commit 1dd9dd2c0b626ac011d792f7711bc7c5c2dbfc01.

diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
index f01255c..e5e10c3 100644
--- a/Modules/Compiler/GNU.cmake
+++ b/Modules/Compiler/GNU.cmake
@@ -30,7 +30,7 @@ macro(__compiler_gnu lang)
   endif()
   set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
   set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
-  set(CMAKE_${lang}_COMPILE_OPTIONS_SYSROOT "--sysroot=")
+  set(CMAKE_SYSROOT_FLAG "--sysroot=")
 
   # Older versions of gcc (< 4.5) contain a bug causing them to report a missing
   # header file as a warning if depfiles are enabled, causing check_header_file
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 2d298c6..271183e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -370,11 +370,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     {
     if (*rootPath)
       {
-      std::string sysrootDef = "CMAKE_";
-      sysrootDef += linkLanguage;
-      sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
       if (const char *sysrootFlag =
-                      this->Makefile->GetDefinition(sysrootDef.c_str()))
+                      this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
         {
         flags += " ";
         flags += sysrootFlag;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index b7def71..36d1a5a 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -597,11 +597,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
       {
       if (*rootPath)
         {
-        std::string sysrootDef = "CMAKE_";
-        sysrootDef += linkLanguage;
-        sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
         if (const char *sysrootFlag =
-                        this->Makefile->GetDefinition(sysrootDef.c_str()))
+                        this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
           {
           linkFlags += " ";
           linkFlags += sysrootFlag;
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 64812f0..1492dfa 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -650,11 +650,8 @@ cmMakefileTargetGenerator
     {
     if (*rootPath)
       {
-      std::string sysrootDef = "CMAKE_";
-      sysrootDef += lang;
-      sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
       if (const char *sysrootFlag =
-                      this->Makefile->GetDefinition(sysrootDef.c_str()))
+                      this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
         {
         flags += " ";
         flags += sysrootFlag;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 6e8be02..921ca92 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -232,11 +232,8 @@ cmNinjaNormalTargetGenerator
       {
       if (*rootPath)
         {
-        std::string sysrootDef = "CMAKE_";
-        sysrootDef += this->TargetLinkLanguage;
-        sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
         if (const char *sysrootFlag =
-                    this->GetMakefile()->GetDefinition(sysrootDef.c_str()))
+                    this->GetMakefile()->GetDefinition("CMAKE_SYSROOT_FLAG"))
           {
           flags += " ";
           flags += sysrootFlag;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 5448cfd..65173ca 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -390,11 +390,8 @@ cmNinjaTargetGenerator
       {
       if (*rootPath)
         {
-        std::string sysrootDef = "CMAKE_";
-        sysrootDef += language;
-        sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
         if (const char *sysrootFlag =
-                        mf->GetDefinition(sysrootDef.c_str()))
+                        this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
           {
           flags += " ";
           flags += sysrootFlag;

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

Summary of changes:
 Modules/Compiler/GNU.cmake                     |    2 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    5 +----
 Source/cmMakefileLibraryTargetGenerator.cxx    |    5 +----
 Source/cmMakefileTargetGenerator.cxx           |    5 +----
 Source/cmNinjaNormalTargetGenerator.cxx        |    5 +----
 Source/cmNinjaTargetGenerator.cxx              |    5 +----
 6 files changed, 6 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake