[Cmake-commits] CMake branch, master, updated. v2.8.11.1-392-g055a38b
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, master has been updated via 055a38bdaf95aa6a56eceb8053d9f6d40b7997ec (commit) from 297b42b0c4f74c27cbf393cefe38b72c453944d2 (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=055a38bdaf95aa6a56eceb8053d9f6d40b7997ec commit 055a38bdaf95aa6a56eceb8053d9f6d40b7997ec Author: Kitware Robot AuthorDate: Fri Jun 28 00:01:04 2013 -0400 Commit: Kitware Robot CommitDate: Fri Jun 28 00:01:04 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 5c5a0cf..fa871b4 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 11) -set(CMake_VERSION_TWEAK 20130627) +set(CMake_VERSION_TWEAK 20130628) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2779-g4dcab11
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 4dcab11e53b843fc01ad0d1ecc267e949292603e (commit)
via d221eac81261679d3580849218220290fcd122df (commit)
via b6385cabec5356b471dc37bd999d1803555ba386 (commit)
via 0c9cc9a0775da100c9744c388bae724acbe34034 (commit)
via 297b42b0c4f74c27cbf393cefe38b72c453944d2 (commit)
from 268f97a02a305e63df46187b2210c0a764052498 (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=4dcab11e53b843fc01ad0d1ecc267e949292603e
commit 4dcab11e53b843fc01ad0d1ecc267e949292603e
Merge: 268f97a d221eac
Author: Brad King
AuthorDate: Thu Jun 27 13:04:13 2013 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 27 13:04:13 2013 -0400
Merge topic 'refactor-compile-options' into next
d221eac Refactor target COMPILE_OPTIONS and COMPILE_FLAGS handling
b6385ca Escape target flags taken from COMPILE_OPTIONS
0c9cc9a Embarcadero: Use response files only for includes, objects, and libs
297b42b CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d221eac81261679d3580849218220290fcd122df
commit d221eac81261679d3580849218220290fcd122df
Author: Brad King
AuthorDate: Thu Jun 27 12:04:02 2013 -0400
Commit: Brad King
CommitDate: Thu Jun 27 12:57:32 2013 -0400
Refactor target COMPILE_OPTIONS and COMPILE_FLAGS handling
Replace the cmLocalGenerator GetCompileOptions method with an
AddCompileOptions method since all call sites of the former simply
append the result to a flags string anyway.
Add a "lang" argument to AddCompileOptions and move the
CMAKE__FLAGS_REGEX filter into it. Move the call sites in each
generator to a location that has both the language and configuration
available. In the Makefile generator this also moves the flags from
build.make to flags.make where they belong.
diff --git a/Source/cmExtraSublimeTextGenerator.cxx
b/Source/cmExtraSublimeTextGenerator.cxx
index 29d86a6..012013c 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -429,34 +429,7 @@
cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
lg->AppendFlags(flags, makefile->GetDefineFlags());
// Add target-specific flags.
- std::string targetFlags;
- lg->GetCompileOptions(targetFlags, target, config);
- if (!targetFlags.empty())
-{
-std::string langIncludeExpr = "CMAKE_";
-langIncludeExpr += language;
-langIncludeExpr += "_FLAG_REGEX";
-const char* regex = makefile->GetDefinition(langIncludeExpr.c_str());
-if(regex)
- {
- cmsys::RegularExpression r(regex);
- std::vector args;
- cmSystemTools::
-ParseWindowsCommandLine(targetFlags.c_str(), args);
- for(std::vector::iterator i = args.begin();
- i != args.end(); ++i)
-{
-if(r.find(i->c_str()))
- {
- lg->AppendFlags(flags, i->c_str());
- }
-}
- }
-else
- {
- lg->AppendFlags(flags, targetFlags.c_str());
- }
-}
+ lg->AddCompileOptions(flags, target, config, language);
// Add source file specific flags.
lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index d9a2620..9cfbe42 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -681,12 +681,6 @@
cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
{
// Add flags from target and source file properties.
std::string flags;
- std::string targetFlags;
- lg->GetCompileOptions(targetFlags, &cmtarget, 0); // TODO: Config?
- if(!targetFlags.empty())
-{
-lg->AppendFlags(flags, targetFlags.c_str());
-}
const char* srcfmt = sf->GetProperty("Fortran_FORMAT");
switch(this->CurrentLocalGenerator->GetFortranFormat(srcfmt))
{
@@ -1704,6 +1698,8 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
this->CurrentLocalGenerator->AddLanguageFlags(cflags, "C", configName);
this->CurrentLocalGenerator->AddCMP0018Flags(cflags, &target,
"C", configName);
+ this->CurrentLocalGenerator->
+AddCompileOptions(cflags, &target, "C", configName);
}
// Add language-specific flags.
@@ -1715,6 +1711,9 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
this->CurrentLocalGenerator->AddVisibilityPresetFlags(flags, &target,
lang);
+
+
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2774-g268f97a
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 268f97a02a305e63df46187b2210c0a764052498 (commit)
via 381e35c0d27605177c04fcbb3ca05b6170a64997 (commit)
via ecef8fbdbeb770b88bfcb8c6e0fd94a2fcb3a12c (commit)
from 5cd8e1fdb5ca0e83ec2970dccbece9c50e2db31f (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=268f97a02a305e63df46187b2210c0a764052498
commit 268f97a02a305e63df46187b2210c0a764052498
Merge: 5cd8e1f 381e35c
Author: Brad King
AuthorDate: Thu Jun 27 10:15:15 2013 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 27 10:15:15 2013 -0400
Merge topic 'compiler-version-genex' into next
381e35c Revert "Escape individual COMPILE_OPTIONS entries."
ecef8fb Revert "Add generator expressions for compiler versions."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=381e35c0d27605177c04fcbb3ca05b6170a64997
commit 381e35c0d27605177c04fcbb3ca05b6170a64997
Author: Brad King
AuthorDate: Thu Jun 27 10:12:06 2013 -0400
Commit: Brad King
CommitDate: Thu Jun 27 10:12:06 2013 -0400
Revert "Escape individual COMPILE_OPTIONS entries."
This reverts commit b528f1c41b51d62c0dbdcddbdd0f3266ccb35506.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 4e2b9af..684c3c4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1354,7 +1354,7 @@ void cmLocalGenerator::GetCompileOptions(std::string&
flags,
for(std::vector::const_iterator li = opts.begin();
li != opts.end(); ++li)
{
-this->AppendFlags(flags, this->EscapeForShell(li->c_str()).c_str());
+this->AppendFlags(flags, li->c_str());
}
}
diff --git a/Tests/CompileOptions/CMakeLists.txt
b/Tests/CompileOptions/CMakeLists.txt
index 8a14006..6d8a96a 100644
--- a/Tests/CompileOptions/CMakeLists.txt
+++ b/Tests/CompileOptions/CMakeLists.txt
@@ -5,7 +5,7 @@ project(CompileOptions)
add_library(testlib other.cpp)
add_executable(CompileOptions main.cpp)
-set_property(TARGET CompileOptions PROPERTY COMPILE_OPTIONS
"$<$:-DTEST_DEFINE>"
"$<$:-DNEEDS_ESCAPE=\"E$CAPE\">")
+set_property(TARGET CompileOptions PROPERTY COMPILE_OPTIONS
"$<$:-DTEST_DEFINE>")
target_link_libraries(CompileOptions testlib)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
diff --git a/Tests/CompileOptions/main.cpp b/Tests/CompileOptions/main.cpp
index 5d555ca..0d39050 100644
--- a/Tests/CompileOptions/main.cpp
+++ b/Tests/CompileOptions/main.cpp
@@ -5,12 +5,7 @@
# endif
#endif
-#include
-
int main(int argc, char **argv)
{
-#ifdef DO_GNU_TESTS
- return strcmp(NEEDS_ESCAPE, "E$CAPE") == 0 ? 0 : 1;
-#endif
return 0;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecef8fbdbeb770b88bfcb8c6e0fd94a2fcb3a12c
commit ecef8fbdbeb770b88bfcb8c6e0fd94a2fcb3a12c
Author: Brad King
AuthorDate: Thu Jun 27 10:12:01 2013 -0400
Commit: Brad King
CommitDate: Thu Jun 27 10:12:01 2013 -0400
Revert "Add generator expressions for compiler versions."
This reverts commit 166bbb6636778167f9a94fbbc6a818bba388a236.
diff --git a/Source/cmDocumentGeneratorExpressions.h
b/Source/cmDocumentGeneratorExpressions.h
index 4caaabf..7358a36 100644
--- a/Source/cmDocumentGeneratorExpressions.h
+++ b/Source/cmDocumentGeneratorExpressions.h
@@ -54,14 +54,6 @@
"else '0'.\n" \
" $= '1' if v1 is the same version as v2, " \
"else '0'.\n" \
- " $ = The CMake-id of the C compiler " \
- "used.\n" \
- " $ = '1' if the CMake-id of the C " \
- "compiler matches ver, otherwise '0'.\n" \
- " $ = The CMake-id of the CXX compiler " \
- "used.\n" \
- " $ = '1' if the CMake-id of the CXX " \
- "compiler matches ver, otherwise '0'.\n" \
" $= main file (.exe, .so.1.2, .a)\n" \
" $ = file used to link (.a, .lib, .so)\n" \
" $ = file with soname (.so.3)\n"\
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 72927db..037ef31 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -396,101 +396,6 @@ static const struct VersionEqualNode : public
cmGeneratorExpressionNode
} versionEqualNode;
//
-struct CompilerVersionNode : public
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2771-g5cd8e1f
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 5cd8e1fdb5ca0e83ec2970dccbece9c50e2db31f (commit)
via b604d9335b559556a50faab29e2c37ac720c8927 (commit)
from 067d587f9c11407e2cdafa0982a2fcc3f8c13060 (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=5cd8e1fdb5ca0e83ec2970dccbece9c50e2db31f
commit 5cd8e1fdb5ca0e83ec2970dccbece9c50e2db31f
Merge: 067d587 b604d93
Author: Brad King
AuthorDate: Thu Jun 27 09:08:03 2013 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 27 09:08:03 2013 -0400
Merge topic 'ninja_phony_targets' into next
b604d93 cmLocalNinjaGenerator: Fix line-too-long style violation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b604d9335b559556a50faab29e2c37ac720c8927
commit b604d9335b559556a50faab29e2c37ac720c8927
Author: Brad King
AuthorDate: Thu Jun 27 08:37:11 2013 -0400
Commit: Brad King
CommitDate: Thu Jun 27 08:37:11 2013 -0400
cmLocalNinjaGenerator: Fix line-too-long style violation
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index f6455fb..bdc3d80 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -340,14 +340,15 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
this->AppendCustomCommandLines(cc, cmdLines);
if (cmdLines.empty()) {
-
this->GetGlobalNinjaGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
- "Phony custom command for "
+
-ninjaOutputs[0],
- ninjaOutputs,
- ninjaDeps,
- cmNinjaDeps(),
- orderOnlyDeps,
- cmNinjaVars());
+this->GetGlobalNinjaGenerator()->WritePhonyBuild(
+ this->GetBuildFileStream(),
+ "Phony custom command for " +
+ ninjaOutputs[0],
+ ninjaOutputs,
+ ninjaDeps,
+ cmNinjaDeps(),
+ orderOnlyDeps,
+ cmNinjaVars());
} else {
this->GetGlobalNinjaGenerator()->WriteCustomCommandBuild(
this->BuildCommandLine(cmdLines),
---
Summary of changes:
Source/cmLocalNinjaGenerator.cxx | 17 +
1 files changed, 9 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
