[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2930-g0db0677
Stephen Kelly
steveire at gmail.com
Thu Jul 4 06:04:30 EDT 2013
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 0db0677dcf8a5aaed461759ac29b23cd038a251b (commit)
via 1dd9dd2c0b626ac011d792f7711bc7c5c2dbfc01 (commit)
via 1101350f76859d3e5a2c2370cf2dfd0ad2b113de (commit)
from 259f57d2777f806640810460b28a861b532099c7 (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=0db0677dcf8a5aaed461759ac29b23cd038a251b
commit 0db0677dcf8a5aaed461759ac29b23cd038a251b
Merge: 259f57d 1dd9dd2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 4 06:04:28 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 4 06:04:28 2013 -0400
Merge topic 'replace-CMAKE_SYSROOT_FLAG' into next
1dd9dd2 Replace CMAKE_SYSROOT_FLAG with a lang specific COMPILE_OPTION.
1101350 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1dd9dd2c0b626ac011d792f7711bc7c5c2dbfc01
commit 1dd9dd2c0b626ac011d792f7711bc7c5c2dbfc01
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 4 12:02:57 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 4 12:02:57 2013 +0200
Replace CMAKE_SYSROOT_FLAG with a lang specific COMPILE_OPTION.
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
index e5e10c3..f01255c 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_SYSROOT_FLAG "--sysroot=")
+ set(CMAKE_${lang}_COMPILE_OPTIONS_SYSROOT "--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 271183e..2d298c6 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -370,8 +370,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
{
if (*rootPath)
{
+ std::string sysrootDef = "CMAKE_";
+ sysrootDef += linkLanguage;
+ sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
if (const char *sysrootFlag =
- this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
+ this->Makefile->GetDefinition(sysrootDef.c_str()))
{
flags += " ";
flags += sysrootFlag;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 36d1a5a..b7def71 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -597,8 +597,11 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
{
if (*rootPath)
{
+ std::string sysrootDef = "CMAKE_";
+ sysrootDef += linkLanguage;
+ sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
if (const char *sysrootFlag =
- this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
+ this->Makefile->GetDefinition(sysrootDef.c_str()))
{
linkFlags += " ";
linkFlags += sysrootFlag;
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 1492dfa..64812f0 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -650,8 +650,11 @@ cmMakefileTargetGenerator
{
if (*rootPath)
{
+ std::string sysrootDef = "CMAKE_";
+ sysrootDef += lang;
+ sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
if (const char *sysrootFlag =
- this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
+ this->Makefile->GetDefinition(sysrootDef.c_str()))
{
flags += " ";
flags += sysrootFlag;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 921ca92..6e8be02 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -232,8 +232,11 @@ cmNinjaNormalTargetGenerator
{
if (*rootPath)
{
+ std::string sysrootDef = "CMAKE_";
+ sysrootDef += this->TargetLinkLanguage;
+ sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
if (const char *sysrootFlag =
- this->GetMakefile()->GetDefinition("CMAKE_SYSROOT_FLAG"))
+ this->GetMakefile()->GetDefinition(sysrootDef.c_str()))
{
flags += " ";
flags += sysrootFlag;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 65173ca..5448cfd 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -390,8 +390,11 @@ cmNinjaTargetGenerator
{
if (*rootPath)
{
+ std::string sysrootDef = "CMAKE_";
+ sysrootDef += language;
+ sysrootDef += "_COMPILE_OPTIONS_SYSROOT";
if (const char *sysrootFlag =
- this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
+ mf->GetDefinition(sysrootDef.c_str()))
{
flags += " ";
flags += sysrootFlag;
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/GNU.cmake | 2 +-
Source/CMakeVersion.cmake | 2 +-
Source/cmMakefileExecutableTargetGenerator.cxx | 5 ++++-
Source/cmMakefileLibraryTargetGenerator.cxx | 5 ++++-
Source/cmMakefileTargetGenerator.cxx | 5 ++++-
Source/cmNinjaNormalTargetGenerator.cxx | 5 ++++-
Source/cmNinjaTargetGenerator.cxx | 5 ++++-
7 files changed, 22 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list