[Cmake-commits] CMake branch, next, updated. v2.8.11-2297-gf1977e3
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 f1977e36c024b42c8f408e9ef2e2756a5410b6de (commit)
via e162326128f70ae1fd1a2bee9449163f87af1d18 (commit)
from 40d4be09f4b86d6b022ed7e21acb07975e41b411 (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=f1977e36c024b42c8f408e9ef2e2756a5410b6de
commit f1977e36c024b42c8f408e9ef2e2756a5410b6de
Merge: 40d4be0 e162326
Author: Stephen Kelly
AuthorDate: Wed May 29 02:41:13 2013 -0400
Commit: CMake Topic Stage
CommitDate: Wed May 29 02:41:13 2013 -0400
Merge topic 'fix-style' into next
e162326 Fix indentation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e162326128f70ae1fd1a2bee9449163f87af1d18
commit e162326128f70ae1fd1a2bee9449163f87af1d18
Author: Stephen Kelly
AuthorDate: Mon May 27 17:45:47 2013 +0200
Commit: Stephen Kelly
CommitDate: Wed May 29 08:40:00 2013 +0200
Fix indentation.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3496823..3e3e5e4 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -963,7 +963,7 @@ void cmGlobalGenerator::Generate()
for ( tit = targets->begin(); tit != targets->end(); ++ tit )
{
-tit->second.AppendBuildInterfaceIncludes();
+ tit->second.AppendBuildInterfaceIncludes();
}
}
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 75873ff..d367c6c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3000,8 +3000,8 @@ std::vector
cmTarget::GetIncludeDirectories(const char *config)
cmListFileBacktrace lfbt;
cmGeneratorExpressionDAGChecker dagChecker(lfbt,
- this->GetName(),
- "INCLUDE_DIRECTORIES", 0, 0);
+ this->GetName(),
+ "INCLUDE_DIRECTORIES", 0, 0);
this->AppendBuildInterfaceIncludes();
---
Summary of changes:
Source/cmGlobalGenerator.cxx |2 +-
Source/cmTarget.cxx |4 ++--
2 files changed, 3 insertions(+), 3 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-2295-g40d4be0
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 40d4be09f4b86d6b022ed7e21acb07975e41b411 (commit)
via 6d585e06e1dd61de0c03cd214fc7f2accdc280fe (commit)
via 36d88746e3a4974a7dd4af3056d47917285755b5 (commit)
from 450bb9d048d2101170a3ae29373d11fa7d90898a (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=40d4be09f4b86d6b022ed7e21acb07975e41b411
commit 40d4be09f4b86d6b022ed7e21acb07975e41b411
Merge: 450bb9d 6d585e0
Author: Stephen Kelly
AuthorDate: Wed May 29 02:09:56 2013 -0400
Commit: CMake Topic Stage
CommitDate: Wed May 29 02:09:56 2013 -0400
Merge topic 'VISIBILITY_PRESET-property' into next
6d585e0 Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target
property.
36d8874 Introduce target property _VISIBILITY_PRESET
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d585e06e1dd61de0c03cd214fc7f2accdc280fe
commit 6d585e06e1dd61de0c03cd214fc7f2accdc280fe
Author: Stephen Kelly
AuthorDate: Thu May 23 15:32:17 2013 +0200
Commit: Stephen Kelly
CommitDate: Wed May 29 08:09:33 2013 +0200
Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target property.
This corresponds to the g++ and clang++
option -fvisibility-inlines-hidden on linux. On Windows with MinGW,
this corresponds to -fno-keep-inline-dllexport. That option is
not supported by clang currently.
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 486e2af..972d889 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -1,2 +1,4 @@
include(Compiler/Clang)
__compiler_clang(CXX)
+
+set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fvisibility-inlines-hidden")
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 879ab8f..9bee962 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -1,2 +1,8 @@
include(Compiler/GNU)
__compiler_gnu(CXX)
+
+if (WIN32)
+ set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fno-keep-inline-dllexport")
+else()
+ set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fvisibility-inlines-hidden")
+endif()
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 71dd3e9..dce1838 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1992,28 +1992,12 @@ void cmLocalGenerator::AddSharedFlags(std::string&
flags,
}
}
-//
-void cmLocalGenerator
-::AddVisibilityPresetFlags(std::string &flags, cmTarget* target,
-const char *lang)
+static void AddVisibilityCompileOption(std::string &flags, cmTarget* target,
+ cmLocalGenerator *lg, const char *lang)
{
- int targetType = target->GetType();
- bool suitableTarget = ((targetType == cmTarget::SHARED_LIBRARY)
- || (targetType == cmTarget::MODULE_LIBRARY)
- || (target->IsExecutableWithExports()));
-
- if (!suitableTarget)
-{
-return;
-}
-
- if (!lang)
-{
-return;
-}
std::string l(lang);
std::string compileOption = "CMAKE_" + l + "_COMPILE_OPTIONS_VISIBILITY";
- const char *opt = this->Makefile->GetDefinition(compileOption.c_str());
+ const char *opt = lg->GetMakefile()->GetDefinition(compileOption.c_str());
if (!opt)
{
return;
@@ -2037,7 +2021,50 @@ void cmLocalGenerator
return;
}
std::string option = std::string(opt) + prop;
- this->AppendFlags(flags, option.c_str());
+ lg->AppendFlags(flags, option.c_str());
+}
+
+static void AddInlineVisibilityCompileOption(std::string &flags,
+ cmTarget* target,
+ cmLocalGenerator *lg)
+{
+ std::string compileOption
+= "CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN";
+ const char *opt = lg->GetMakefile()->GetDefinition(compileOption.c_str());
+ if (!opt)
+{
+return;
+}
+
+ bool prop = target->GetPropertyAsBool("VISIBILITY_INLINES_HIDDEN");
+ if (!prop)
+{
+return;
+}
+ lg->AppendFlags(flags, opt);
+}
+
+//
+void cmLocalGenerator
+::AddVisibilityPresetFlags(std::string &flags, cmTarget* target,
+const char *lang)
+{
+ int targetType = target->GetType();
+ bool suitableTarget = ((targetType == cmTarget::SHARED_LIBRARY)
+ || (targetType == cmTarget::MODULE_LIBRARY)
+
[Cmake-commits] CMake branch, next, updated. v2.8.11-2292-g450bb9d
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 450bb9d048d2101170a3ae29373d11fa7d90898a (commit) via ed198cdefdf4e7838c35348714637a9113439978 (commit) from 385560cf4a62642dd87dbe96e3d145136d81c791 (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=450bb9d048d2101170a3ae29373d11fa7d90898a commit 450bb9d048d2101170a3ae29373d11fa7d90898a Merge: 385560c ed198cd Author: Stephen Kelly AuthorDate: Wed May 29 02:09:15 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed May 29 02:09:15 2013 -0400 Merge topic 'VISIBILITY_PRESET-property' into next ed198cd Fix test name. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed198cdefdf4e7838c35348714637a9113439978 commit ed198cdefdf4e7838c35348714637a9113439978 Author: Stephen Kelly AuthorDate: Wed May 29 08:08:32 2013 +0200 Commit: Stephen Kelly CommitDate: Wed May 29 08:08:32 2013 +0200 Fix test name. diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 7a256a9..260a87c 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -65,7 +65,7 @@ add_RunCMake_test(Languages) add_RunCMake_test(ObjectLibrary) if(NOT WIN32) add_RunCMake_test(PositionIndependentCode) - add_RunCMake_test(PresetVisibility) + add_RunCMake_test(VisibilityPreset) endif() add_RunCMake_test(CompatibleInterface) --- Summary of changes: Tests/RunCMake/CMakeLists.txt |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, master, updated. v2.8.11-209-g6927b25
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 6927b25affcb9e2e01fb226970fd91db143b5101 (commit) from 590a41ba0ead92f3989b3c226632c29fac76bf2e (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=6927b25affcb9e2e01fb226970fd91db143b5101 commit 6927b25affcb9e2e01fb226970fd91db143b5101 Author: Kitware Robot AuthorDate: Wed May 29 00:01:03 2013 -0400 Commit: Kitware Robot CommitDate: Wed May 29 00:01:03 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b831cbb..01e8512 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 20130528) +set(CMake_VERSION_TWEAK 20130529) #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-2290-g385560c
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 385560cf4a62642dd87dbe96e3d145136d81c791 (commit)
via 886facc343aaabb054d4471dd2c496be5842ff20 (commit)
from 14bc56ac6962a4cf8768b8a91d7634628ba7e9ff (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=385560cf4a62642dd87dbe96e3d145136d81c791
commit 385560cf4a62642dd87dbe96e3d145136d81c791
Merge: 14bc56a 886facc
Author: Stephen Kelly
AuthorDate: Tue May 28 19:08:43 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 19:08:43 2013 -0400
Merge topic 'fix-INCLUDE_DIRECTORIES-genex-read' into next
886facc GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property.
diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index 8e08b9a,e3fdf71..445f599
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -495,9 -397,50 +495,51 @@@ static const struct JoinNode : public c
static const char* targetPropertyTransitiveWhitelist[] = {
"INTERFACE_INCLUDE_DIRECTORIES"
, "INTERFACE_COMPILE_DEFINITIONS"
+ , "INTERFACE_COMPILE_OPTIONS"
};
+ std::string getLinkedTargetsContent(const std::vector &libraries,
+ cmTarget *target,
+ cmGeneratorExpressionContext *context,
+ cmGeneratorExpressionDAGChecker *dagChecker,
+ const std::string &interfacePropertyName)
+ {
+ cmGeneratorExpression ge(context->Backtrace);
+
+ std::string sep;
+ std::string depString;
+ for (std::vector::const_iterator
+ it = libraries.begin();
+ it != libraries.end(); ++it)
+ {
+ if (*it == target->GetName())
+ {
+ // Broken code can have a target in its own link interface.
+ // Don't follow such link interface entries so as not to create a
+ // self-referencing loop.
+ continue;
+ }
+ if (context->Makefile->FindTargetToUse(it->c_str()))
+ {
+ depString +=
+ sep + "$";
+ sep = ";";
+ }
+ }
+ cmsys::auto_ptr cge = ge.Parse(depString);
+ std::string linkedTargetsContent = cge->Evaluate(context->Makefile,
+ context->Config,
+ context->Quiet,
+ context->HeadTarget,
+ target,
+ dagChecker);
+ if (cge->GetHadContextSensitiveCondition())
+ {
+ context->HadContextSensitiveCondition = true;
+ }
+ return linkedTargetsContent;
+ }
+
//
struct TransitiveWhitelistCompare
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=886facc343aaabb054d4471dd2c496be5842ff20
commit 886facc343aaabb054d4471dd2c496be5842ff20
Author: Stephen Kelly
AuthorDate: Wed May 29 00:34:30 2013 +0200
Commit: Stephen Kelly
CommitDate: Wed May 29 01:05:28 2013 +0200
GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property.
This property should come from the content of the property itself,
plus the INTERFACE_INCLUDE_DIRECTORIES of the link *implementation*.
In contrast, when the INTERFACE_INCLUDE_DIRECTORIES is evaluated for
a target, the INTERFACE_INCLUDE_DIRECTORIES of the link *interface*
is used.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 3a8aaae..e3fdf71 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -399,6 +399,48 @@ static const char* targetPropertyTransitiveWhitelist[] = {
, "INTERFACE_COMPILE_DEFINITIONS"
};
+std::string getLinkedTargetsContent(const std::vector &libraries,
+ cmTarget *target,
+ cmGeneratorExpressionContext *context,
+ cmGeneratorExpressionDAGChecker *dagChecker,
+ const std::string &interfacePropertyName)
+{
+ cmGeneratorExpression ge(context->Backtrace);
+
+ std::string sep;
+ std::string depString;
+ for (std::vector::const_iterator
+ it = libraries.begin();
+ it != libraries.end(); ++it)
+{
+if (*it == target->GetName())
+ {
+ // Broken code can have a target in its own link interface.
+ // Don't follow such link interface entries so as not to create a
+ // self-referencing loop.
+ continue;
+ }
+if (context->Makefile->FindTargetToUse(it->c_str()))
+ {
+ depString +=
+sep + "$";
+ sep
[Cmake-commits] CMake branch, next, updated. v2.8.11-2288-g14bc56a
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 14bc56ac6962a4cf8768b8a91d7634628ba7e9ff (commit)
via 31084c207d23c98f85f160ab98e37ff8a705818c (commit)
from ffabbf861be0e5012581f5c0cecea703606a6f72 (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=14bc56ac6962a4cf8768b8a91d7634628ba7e9ff
commit 14bc56ac6962a4cf8768b8a91d7634628ba7e9ff
Merge: ffabbf8 31084c2
Author: Stephen Kelly
AuthorDate: Tue May 28 14:39:01 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 14:39:01 2013 -0400
Merge topic 'suppress-unused-cli-with-value-in-cache' into next
31084c2 CLI: Suppress the unused warning if the key value pair is cached.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31084c207d23c98f85f160ab98e37ff8a705818c
commit 31084c207d23c98f85f160ab98e37ff8a705818c
Author: Stephen Kelly
AuthorDate: Thu May 16 21:51:45 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue May 28 20:38:18 2013 +0200
CLI: Suppress the unused warning if the key value pair is cached.
It is common to specify a CMAKE_TOOLCHAIN_FILE and get a warning
for using it despite it not being used.
The WarnUnusedCliUnused test relies on the warning being emitted
each time cmake is run on an existing build. That behavior is changed
by this patch to warn only on the first invokation of CMake, and not
on subsequent invokations (because the variable is in the cache with
the same value). For that test, a clean target is added which clears
the cache and cause the warning to be emitted each time.
As the Ninja generator does not support the feature needed to test
this, it is not tested with that generator.
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 864df8e..ed09545 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -750,6 +750,10 @@ void cmCacheManager::AddCacheEntry(const char* key,
}
e.SetProperty("HELPSTRING", helpString? helpString :
"(This variable does not exist and should not be used)");
+ if (this->Cache[key].Value == e.Value)
+{
+this->CMakeInstance->UnwatchUnusedCli(key);
+}
this->Cache[key] = e;
}
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index ae62edb..e757f3a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -383,11 +383,22 @@ bool cmake::SetCacheArgs(const std::vector&
args)
cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED;
if(cmCacheManager::ParseEntry(entry.c_str(), var, value, type))
{
+// The value is transformed if it is a filepath for example, so
+// we can't compare whether the value is already in the cache until
+// after we call AddCacheEntry.
+const char *cachedValue =
+ this->CacheManager->GetCacheValue(var.c_str());
+
this->CacheManager->AddCacheEntry(var.c_str(), value.c_str(),
"No help, variable specified on the command line.", type);
if(this->WarnUnusedCli)
{
- this->WatchUnusedCli(var.c_str());
+ if (!cachedValue
+ || strcmp(this->CacheManager->GetCacheValue(var.c_str()),
+cachedValue) != 0)
+{
+this->WatchUnusedCli(var.c_str());
+}
}
}
else
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 0b221e8..e37c96b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1618,17 +1618,20 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
FAIL_REGULAR_EXPRESSION "CMake Warning
.*VariableUnusedViaUnset.CMakeLists.txt:5 \\(set\\):")
list(APPEND TEST_BUILD_DIRS
"${CMake_BINARY_DIR}/Tests/WarnUnusedUnusedViaUnset")
- add_test(WarnUnusedCliUnused ${CMAKE_CTEST_COMMAND}
---build-and-test
-"${CMake_SOURCE_DIR}/Tests/VariableUsage"
-"${CMake_BINARY_DIR}/Tests/WarnUnusedCliUnused"
-${build_generator_args}
---build-noclean
---build-project WarnUnusedCliUnused
---build-options "-DUNUSED_CLI_VARIABLE=Unused")
- set_tests_properties(WarnUnusedCliUnused PROPERTIES
-PASS_REGULAR_EXPRESSION "CMake Warning:.*Manually-specified variables were
not used by the project:.* UNUSED_CLI_VARIABLE")
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUnused")
+ if (NOT CMAKE_TEST_GENERATOR MATCHES "Ninja")
+# Ninja does not support ADDITIONAL_MAKE_CLEAN_FILES and therefore fails
+# this test. (See #13371)
+add_test(WarnUnusedCliUnused ${CMAKE_CTEST_COMMAND}
+
[Cmake-commits] CMake branch, next, updated. v2.8.11-2286-gffabbf8
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 ffabbf861be0e5012581f5c0cecea703606a6f72 (commit)
via f4c1723215f0014e7c1e8ac67d208c50959c71dd (commit)
via fab5b0cbee9b169be9e9b7623d4f8a8caa520663 (commit)
from db2958a6934479249dd1214c047b0c533693a2ac (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=ffabbf861be0e5012581f5c0cecea703606a6f72
commit ffabbf861be0e5012581f5c0cecea703606a6f72
Merge: db2958a f4c1723
Author: Stephen Kelly
AuthorDate: Tue May 28 13:39:12 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 13:39:12 2013 -0400
Merge topic 'target-COMPILE_OPTIONS' into next
f4c1723 Add target_compile_options command.
fab5b0c Add COMPILE_OPTIONS target property.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4c1723215f0014e7c1e8ac67d208c50959c71dd
commit f4c1723215f0014e7c1e8ac67d208c50959c71dd
Author: Stephen Kelly
AuthorDate: Thu May 16 15:20:16 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue May 28 19:38:21 2013 +0200
Add target_compile_options command.
This command populates the COMPILE_OPTIONS target property.
diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx
index 227b226..75f2ae8 100644
--- a/Source/cmCommands.cxx
+++ b/Source/cmCommands.cxx
@@ -29,6 +29,7 @@
#include "cmSourceGroupCommand.cxx"
#include "cmSubdirDependsCommand.cxx"
#include "cmTargetCompileDefinitionsCommand.cxx"
+#include "cmTargetCompileOptionsCommand.cxx"
#include "cmTargetIncludeDirectoriesCommand.cxx"
#include "cmTargetPropCommandBase.cxx"
#include "cmUseMangledMesaCommand.cxx"
@@ -71,6 +72,7 @@ void GetPredefinedCommands(std::list&
commands.push_back(new cmSubdirDependsCommand);
commands.push_back(new cmTargetIncludeDirectoriesCommand);
commands.push_back(new cmTargetCompileDefinitionsCommand);
+ commands.push_back(new cmTargetCompileOptionsCommand);
commands.push_back(new cmUseMangledMesaCommand);
commands.push_back(new cmUtilitySourceCommand);
commands.push_back(new cmVariableRequiresCommand);
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 96cfe8d..3e900a3 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3068,6 +3068,20 @@ void cmTarget::InsertInclude(const cmValueWithOrigin
&entry,
}
//
+void cmTarget::InsertCompileOption(const cmValueWithOrigin &entry,
+ bool before)
+{
+ cmGeneratorExpression ge(entry.Backtrace);
+
+ std::vector::iterator position
+= before ? this->Internal->CompileOptionsEntries.begin()
+ : this->Internal->CompileOptionsEntries.end();
+
+ this->Internal->CompileOptionsEntries.insert(position,
+ new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry.Value)));
+}
+
+//
static void processIncludeDirectories(cmTarget *tgt,
const std::vector &entries,
std::vector &includes,
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7ec10df..b3d1131 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -500,6 +500,8 @@ public:
std::vector GetIncludeDirectories(const char *config);
void InsertInclude(const cmValueWithOrigin &entry,
bool before = false);
+ void InsertCompileOption(const cmValueWithOrigin &entry,
+ bool before = false);
void AppendBuildInterfaceIncludes();
diff --git a/Source/cmTargetCompileOptionsCommand.cxx
b/Source/cmTargetCompileOptionsCommand.cxx
new file mode 100644
index 000..e80c845
--- /dev/null
+++ b/Source/cmTargetCompileOptionsCommand.cxx
@@ -0,0 +1,62 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2013 Stephen Kelly
+
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+*/
+#include "cmTargetCompileOptionsCommand.h"
+
+bool cmTargetCompileOptionsCommand
+::InitialPass(std::vector const& args, cmExecutionStatus &)
+{
+ return this->HandleArguments(args, "COMPILE_OPTIONS", PROCESS_BEFORE);
+}
+
+void cmTargetCompileOptionsCommand
+::HandleImportedTarget(const std::string &tgt)
+{
+ cmOStringStream e;
+ e << "Ca
[Cmake-commits] CMake branch, next, updated. v2.8.11-2283-gdb2958a
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 db2958a6934479249dd1214c047b0c533693a2ac (commit) via 0368b7463e5302a3bc9ea8fb8b5da03328dc839e (commit) from 05dbdbca245262d5e5aab0ca12b72cc19f040ee5 (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=db2958a6934479249dd1214c047b0c533693a2ac commit db2958a6934479249dd1214c047b0c533693a2ac Merge: 05dbdbc 0368b74 Author: Stephen Kelly AuthorDate: Tue May 28 13:38:03 2013 -0400 Commit: CMake Topic Stage CommitDate: Tue May 28 13:38:03 2013 -0400 Merge topic 'target-COMPILE_OPTIONS' into next 0368b74 Test with a platform independent define instead of a -f flag. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0368b7463e5302a3bc9ea8fb8b5da03328dc839e commit 0368b7463e5302a3bc9ea8fb8b5da03328dc839e Author: Stephen Kelly AuthorDate: Tue May 28 19:37:23 2013 +0200 Commit: Stephen Kelly CommitDate: Tue May 28 19:37:23 2013 +0200 Test with a platform independent define instead of a -f flag. diff --git a/Tests/CompileOptions/CMakeLists.txt b/Tests/CompileOptions/CMakeLists.txt index 75c6f32..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 "$<$:-fPIE>") +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 eec0805..0d39050 100644 --- a/Tests/CompileOptions/main.cpp +++ b/Tests/CompileOptions/main.cpp @@ -1,7 +1,7 @@ #ifdef DO_GNU_TESTS -# ifndef __PIE__ -#error Expected __PIE__ +# ifndef TEST_DEFINE +#error Expected TEST_DEFINE # endif #endif --- Summary of changes: Tests/CompileOptions/CMakeLists.txt |2 +- Tests/CompileOptions/main.cpp |4 ++-- 2 files changed, 3 insertions(+), 3 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-2272-g8bea290
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 8bea2901ce56a626d7b5f1bf4a55ecf50927e878 (commit)
via 813e1629d61aef9c21d0e54383d0414cb1010fb4 (commit)
from 752812651f32dc7b0f65fadc6143e7c56dc68558 (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=8bea2901ce56a626d7b5f1bf4a55ecf50927e878
commit 8bea2901ce56a626d7b5f1bf4a55ecf50927e878
Merge: 7528126 813e162
Author: Stephen Kelly
AuthorDate: Tue May 28 13:32:53 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 13:32:53 2013 -0400
Merge topic 'target-COMPILE_OPTIONS' into next
813e162 Fix style.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=813e1629d61aef9c21d0e54383d0414cb1010fb4
commit 813e1629d61aef9c21d0e54383d0414cb1010fb4
Author: Stephen Kelly
AuthorDate: Tue May 28 19:32:20 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue May 28 19:32:20 2013 +0200
Fix style.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 762609c..8e08b9a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -498,9 +498,11 @@ static const char* targetPropertyTransitiveWhitelist[] = {
, "INTERFACE_COMPILE_OPTIONS"
};
+//
struct TransitiveWhitelistCompare
{
- explicit TransitiveWhitelistCompare(const std::string &needle) :
Needle(needle) {}
+ explicit TransitiveWhitelistCompare(const std::string &needle)
+: Needle(needle) {}
bool operator() (const char *item)
{ return strcmp(item, this->Needle.c_str()) == 0; }
private:
---
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx |4 +++-
1 files changed, 3 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-2270-g7528126
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 752812651f32dc7b0f65fadc6143e7c56dc68558 (commit)
via 632912c3d7d8f59f8bd729d75976eaa18f3615d1 (commit)
from fcf8945a22a0790e738a3adf4e385570f437b7c7 (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=752812651f32dc7b0f65fadc6143e7c56dc68558
commit 752812651f32dc7b0f65fadc6143e7c56dc68558
Merge: fcf8945 632912c
Author: Stephen Kelly
AuthorDate: Tue May 28 12:30:20 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 12:30:20 2013 -0400
Merge topic 'target-COMPILE_OPTIONS' into next
632912c Only run the GNU compiler tests when using that compiler.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=632912c3d7d8f59f8bd729d75976eaa18f3615d1
commit 632912c3d7d8f59f8bd729d75976eaa18f3615d1
Author: Stephen Kelly
AuthorDate: Tue May 28 18:29:23 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue May 28 18:29:44 2013 +0200
Only run the GNU compiler tests when using that compiler.
diff --git a/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
b/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
index 59f1f91..06a48fb 100644
--- a/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_options/CMakeLists.txt
@@ -12,6 +12,13 @@ target_compile_options(target_compile_options
INTERFACE $<$:-DMY_INTERFACE_DEFINE>
)
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ target_compile_definitions(target_compile_options
+PRIVATE
+ "DO_GNU_TESTS"
+ )
+endif()
+
add_executable(consumer
"${CMAKE_CURRENT_SOURCE_DIR}/consumer.cpp"
)
@@ -19,3 +26,10 @@ add_executable(consumer
target_compile_options(consumer
PRIVATE
$<$:$>
)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ target_compile_definitions(consumer
+PRIVATE
+ "DO_GNU_TESTS"
+ )
+endif()
diff --git a/Tests/CMakeCommands/target_compile_options/consumer.cpp
b/Tests/CMakeCommands/target_compile_options/consumer.cpp
index 1178e74..1299606 100644
--- a/Tests/CMakeCommands/target_compile_options/consumer.cpp
+++ b/Tests/CMakeCommands/target_compile_options/consumer.cpp
@@ -1,14 +1,18 @@
-#ifdef MY_PRIVATE_DEFINE
-#error Unexpected MY_PRIVATE_DEFINE
-#endif
+#ifdef DO_GNU_TESTS
-#ifndef MY_PUBLIC_DEFINE
-#error Expected MY_PUBLIC_DEFINE
-#endif
+# ifdef MY_PRIVATE_DEFINE
+# error Unexpected MY_PRIVATE_DEFINE
+# endif
+
+# ifndef MY_PUBLIC_DEFINE
+# error Expected MY_PUBLIC_DEFINE
+# endif
+
+# ifndef MY_INTERFACE_DEFINE
+# error Expected MY_INTERFACE_DEFINE
+# endif
-#ifndef MY_INTERFACE_DEFINE
-#error Expected MY_INTERFACE_DEFINE
#endif
int main() { return 0; }
diff --git a/Tests/CMakeCommands/target_compile_options/main.cpp
b/Tests/CMakeCommands/target_compile_options/main.cpp
index addb33c..961c06d 100644
--- a/Tests/CMakeCommands/target_compile_options/main.cpp
+++ b/Tests/CMakeCommands/target_compile_options/main.cpp
@@ -1,14 +1,18 @@
-#ifndef MY_PRIVATE_DEFINE
-#error Expected MY_PRIVATE_DEFINE
-#endif
+#ifdef DO_GNU_TESTS
-#ifndef MY_PUBLIC_DEFINE
-#error Expected MY_PUBLIC_DEFINE
-#endif
+# ifndef MY_PRIVATE_DEFINE
+# error Expected MY_PRIVATE_DEFINE
+# endif
+
+# ifndef MY_PUBLIC_DEFINE
+# error Expected MY_PUBLIC_DEFINE
+# endif
+
+# ifdef MY_INTERFACE_DEFINE
+# error Unexpected MY_INTERFACE_DEFINE
+# endif
-#ifdef MY_INTERFACE_DEFINE
-#error Unexpected MY_INTERFACE_DEFINE
#endif
int main() { return 0; }
---
Summary of changes:
.../target_compile_options/CMakeLists.txt | 14 ++
.../target_compile_options/consumer.cpp| 20
.../CMakeCommands/target_compile_options/main.cpp | 20
3 files changed, 38 insertions(+), 16 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-2268-gfcf8945
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 fcf8945a22a0790e738a3adf4e385570f437b7c7 (commit)
via e897f8d098286068625c7a58fde006c2c47e79fe (commit)
from 0eec0ae6d47ca4bec4fa631e27cff598db2db621 (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=fcf8945a22a0790e738a3adf4e385570f437b7c7
commit fcf8945a22a0790e738a3adf4e385570f437b7c7
Merge: 0eec0ae e897f8d
Author: Stephen Kelly
AuthorDate: Tue May 28 12:27:07 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 12:27:07 2013 -0400
Merge topic 'target-COMPILE_OPTIONS' into next
e897f8d Fix build of xcode generator.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e897f8d098286068625c7a58fde006c2c47e79fe
commit e897f8d098286068625c7a58fde006c2c47e79fe
Author: Stephen Kelly
AuthorDate: Tue May 28 18:26:29 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue May 28 18:26:29 2013 +0200
Fix build of xcode generator.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index cd20ae8..10de35a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -680,11 +680,12 @@
cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
cmTarget& cmtarget)
{
// Add flags from target and source file properties.
+ std::string flags;
std::string targetFlags;
lg->GetCompileOptions(targetFlags, &cmtarget, 0); // TODO: Config?
- if(!targetFlags)
+ if(!targetFlags.empty())
{
-lg->AppendFlags(flags, targetFlags);
+lg->AppendFlags(flags, targetFlags.c_str());
}
const char* srcfmt = sf->GetProperty("Fortran_FORMAT");
switch(this->CurrentLocalGenerator->GetFortranFormat(srcfmt))
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx |5 +++--
1 files changed, 3 insertions(+), 2 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-2266-g0eec0ae
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 0eec0ae6d47ca4bec4fa631e27cff598db2db621 (commit)
via ad945e08a41207859f40979069eaf720f74d9a99 (commit)
via 8b29b88a478d71185dc829f7f8694663ee779386 (commit)
from c25faab77b8bda94ea1bd6dbf4a7b3823332d21e (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=0eec0ae6d47ca4bec4fa631e27cff598db2db621
commit 0eec0ae6d47ca4bec4fa631e27cff598db2db621
Merge: c25faab ad945e0
Author: Stephen Kelly
AuthorDate: Tue May 28 11:45:59 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 11:45:59 2013 -0400
Merge topic 'target-COMPILE_OPTIONS' into next
ad945e0 VS6: Rename some variables to correspond to config values.
8b29b88 Fix use of new GetCompileOptions API.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad945e08a41207859f40979069eaf720f74d9a99
commit ad945e08a41207859f40979069eaf720f74d9a99
Author: Stephen Kelly
AuthorDate: Tue May 28 17:44:35 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue May 28 17:44:35 2013 +0200
VS6: Rename some variables to correspond to config values.
This simplifies population of the compile flags.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx
b/Source/cmLocalVisualStudio6Generator.cxx
index 18b17a1..4c78f7f 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1639,9 +1639,9 @@ void cmLocalVisualStudio6Generator
// store flags for each configuration
std::string flags = " ";
std::string flagsRelease = " ";
-std::string flagsMinSize = " ";
+std::string flagsMinSizeRel = " ";
std::string flagsDebug = " ";
-std::string flagsDebugRel = " ";
+std::string flagsRelWithDebInfo = " ";
if(target.GetType() >= cmTarget::EXECUTABLE &&
target.GetType() <= cmTarget::OBJECT_LIBRARY)
{
@@ -1664,16 +1664,16 @@ void cmLocalVisualStudio6Generator
flagsRelease += " -DCMAKE_INTDIR=\\\"Release\\\" ";
flagVar = baseFlagVar + "_MINSIZEREL";
- flagsMinSize = this->Makefile->GetSafeDefinition(flagVar.c_str());
- flagsMinSize += " -DCMAKE_INTDIR=\\\"MinSizeRel\\\" ";
+ flagsMinSizeRel = this->Makefile->GetSafeDefinition(flagVar.c_str());
+ flagsMinSizeRel += " -DCMAKE_INTDIR=\\\"MinSizeRel\\\" ";
flagVar = baseFlagVar + "_DEBUG";
flagsDebug = this->Makefile->GetSafeDefinition(flagVar.c_str());
flagsDebug += " -DCMAKE_INTDIR=\\\"Debug\\\" ";
flagVar = baseFlagVar + "_RELWITHDEBINFO";
- flagsDebugRel = this->Makefile->GetSafeDefinition(flagVar.c_str());
- flagsDebugRel += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
+ flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
+ flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
}
// if _UNICODE and _SBCS are not found, then add -D_MBCS
@@ -1750,19 +1750,19 @@ void cmLocalVisualStudio6Generator
flags += defines;
flagsDebug += debugDefines;
flagsRelease += releaseDefines;
-flagsMinSize += minsizeDefines;
-flagsDebugRel += debugrelDefines;
+flagsMinSizeRel += minsizeDefines;
+flagsRelWithDebInfo += debugrelDefines;
// The template files have CXX FLAGS in them, that need to be replaced.
// There are not separate CXX and C template files, so we use the same
// variable names. The previous code sets up flags* variables to contain
// the correct C or CXX flags
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_MINSIZEREL",
- flagsMinSize.c_str());
+ flagsMinSizeRel.c_str());
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_DEBUG",
flagsDebug.c_str());
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELWITHDEBINFO",
- flagsDebugRel.c_str());
+ flagsRelWithDebInfo.c_str());
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELEASE",
flagsRelease.c_str());
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS", flags.c_str());
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b29b88a478d71185dc829f7f8694663ee779386
commit 8b29b88a478d71185dc829f7f8694663ee779386
Author: Stephen Kelly
AuthorDate: Tue May 28 17:44:14 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue May 28 17:44:14 2013 +0200
Fix use of new GetCompileOptions API.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx
b/Source/cmLocalVisualStudio6Gene
[Cmake-commits] CMake branch, master, updated. v2.8.11-198-g9c13932
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 9c1393217c34f3fae101d5852df67a71edebb605 (commit) via 81b5fb5b0dd82fb6d68512275a54c50585aafee1 (commit) from 97c2166de4c6f19d95e68034a1c5d7bdf14446da (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=9c1393217c34f3fae101d5852df67a71edebb605 commit 9c1393217c34f3fae101d5852df67a71edebb605 Merge: 97c2166 81b5fb5 Author: Brad King AuthorDate: Tue May 28 10:42:12 2013 -0400 Commit: CMake Topic Stage CommitDate: Tue May 28 10:42:12 2013 -0400 Merge topic 'use-java-use-parse-arguments' 81b5fb5 UseJava.cmake: fully use cmake_parse_arguments in add_jar --- Summary of changes: Modules/UseJava.cmake | 93 ++-- 1 files changed, 58 insertions(+), 35 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-2255-g89d6d32
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 89d6d32e92dd250417718323455a7e5a22f795f6 (commit) via 590a41ba0ead92f3989b3c226632c29fac76bf2e (commit) via 07942da96cc2db73877f0ed916edf16dc9476a85 (commit) via 93e9291da73b845ac8c7e70921a4deb400f4f1fc (commit) via 7cde91cc8c0d2a2152183c1bb40ebae36ce60307 (commit) via be85fa4a8916819514ca5c5c01db14733d5b9bce (commit) via 9c1393217c34f3fae101d5852df67a71edebb605 (commit) via 97c2166de4c6f19d95e68034a1c5d7bdf14446da (commit) from 898a30ce6278153dc4c8d37363c4d6445800df43 (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=89d6d32e92dd250417718323455a7e5a22f795f6 commit 89d6d32e92dd250417718323455a7e5a22f795f6 Merge: 898a30c 590a41b Author: Brad King AuthorDate: Tue May 28 10:41:30 2013 -0400 Commit: Brad King CommitDate: Tue May 28 10:41:30 2013 -0400 Merge branch 'master' into next --- 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, master, updated. v2.8.11-204-g93e9291
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 93e9291da73b845ac8c7e70921a4deb400f4f1fc (commit) via 8961c4b68bdf3202be0451a68418922cf869439c (commit) from 7cde91cc8c0d2a2152183c1bb40ebae36ce60307 (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=93e9291da73b845ac8c7e70921a4deb400f4f1fc commit 93e9291da73b845ac8c7e70921a4deb400f4f1fc Merge: 7cde91c 8961c4b Author: Brad King AuthorDate: Tue May 28 10:42:29 2013 -0400 Commit: CMake Topic Stage CommitDate: Tue May 28 10:42:29 2013 -0400 Merge topic 'fix-protobuf-threads' 8961c4b FindProtobuf: also find pthread --- Summary of changes: Modules/FindProtobuf.cmake | 13 + 1 files changed, 13 insertions(+), 0 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, master, updated. v2.8.11-206-g07942da
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 07942da96cc2db73877f0ed916edf16dc9476a85 (commit) via c35961b010da87492a60afb6e5dd7436ea36ed8b (commit) from 93e9291da73b845ac8c7e70921a4deb400f4f1fc (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=07942da96cc2db73877f0ed916edf16dc9476a85 commit 07942da96cc2db73877f0ed916edf16dc9476a85 Merge: 93e9291 c35961b Author: Brad King AuthorDate: Tue May 28 10:42:33 2013 -0400 Commit: CMake Topic Stage CommitDate: Tue May 28 10:42:33 2013 -0400 Merge topic 'ExternalData-no-re-stage' c35961b ExternalData: Do not re-stage staged object files --- Summary of changes: Modules/ExternalData.cmake |5 ++- .../ExternalData/LinkDirectory1-stdout.txt |5 +++ Tests/RunCMake/ExternalData/LinkDirectory1.cmake | 37 Tests/RunCMake/ExternalData/RunCMakeTest.cmake |1 + 4 files changed, 47 insertions(+), 1 deletions(-) create mode 100644 Tests/RunCMake/ExternalData/LinkDirectory1-stdout.txt create mode 100644 Tests/RunCMake/ExternalData/LinkDirectory1.cmake 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, master, updated. v2.8.11-208-g590a41b
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 590a41ba0ead92f3989b3c226632c29fac76bf2e (commit) via e65ef08bf2719ffd1cc4226f9594ff7127ad8b5e (commit) from 07942da96cc2db73877f0ed916edf16dc9476a85 (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=590a41ba0ead92f3989b3c226632c29fac76bf2e commit 590a41ba0ead92f3989b3c226632c29fac76bf2e Merge: 07942da e65ef08 Author: Brad King AuthorDate: Tue May 28 10:42:40 2013 -0400 Commit: CMake Topic Stage CommitDate: Tue May 28 10:42:40 2013 -0400 Merge topic 'fix-try_compile-library-spaces' e65ef08 try_compile: Fix quoting of libraries in generated CMakeLists.txt --- Summary of changes: Source/cmCoreTryCompile.cxx |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, master, updated. v2.8.11-200-gbe85fa4
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 be85fa4a8916819514ca5c5c01db14733d5b9bce (commit)
via b983a58bdf1a03a49f2512ac68390888669ac30b (commit)
from 9c1393217c34f3fae101d5852df67a71edebb605 (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=be85fa4a8916819514ca5c5c01db14733d5b9bce
commit be85fa4a8916819514ca5c5c01db14733d5b9bce
Merge: 9c13932 b983a58
Author: Brad King
AuthorDate: Tue May 28 10:42:18 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 10:42:18 2013 -0400
Merge topic 'genex-generate-file'
b983a58 file: Add GENERATE command to produce files at generate time
---
Summary of changes:
Source/cmBootstrapCommands.cxx |1 +
Source/cmFileCommand.cxx | 78 ++
Source/cmFileCommand.h | 19 +++
Source/cmGeneratorExpressionEvaluationFile.cxx | 151
Source/cmGeneratorExpressionEvaluationFile.h | 48 ++
Source/cmGlobalGenerator.cxx | 51 +++
Source/cmGlobalGenerator.h | 11 ++
Tests/RunCMake/CMakeLists.txt |2 +
.../BadCondition-result.txt} |0
.../RunCMake/File_Generate/BadCondition-stderr.txt |3 +
Tests/RunCMake/File_Generate/BadCondition.cmake|5 +
.../{CMP0004 => File_Generate}/CMakeLists.txt |0
.../CommandConflict-result.txt}|0
.../File_Generate/CommandConflict-stderr.txt |1 +
Tests/RunCMake/File_Generate/CommandConflict.cmake |9 ++
Tests/RunCMake/File_Generate/DebugEvaluate.cmake |5 +
.../EmptyCondition1-result.txt}|0
.../File_Generate/EmptyCondition1-stderr.txt |4 +
Tests/RunCMake/File_Generate/EmptyCondition1.cmake |5 +
.../EmptyCondition2-result.txt}|0
.../File_Generate/EmptyCondition2-stderr.txt |4 +
Tests/RunCMake/File_Generate/EmptyCondition2.cmake |5 +
.../OutputConflict-result.txt} |0
.../File_Generate/OutputConflict-stderr.txt|5 +
Tests/RunCMake/File_Generate/OutputConflict.cmake |4 +
Tests/RunCMake/File_Generate/RunCMakeTest.cmake| 10 ++
Tests/RunCMake/File_Generate/input.txt |1 +
27 files changed, 422 insertions(+), 0 deletions(-)
create mode 100644 Source/cmGeneratorExpressionEvaluationFile.cxx
create mode 100644 Source/cmGeneratorExpressionEvaluationFile.h
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
File_Generate/BadCondition-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/BadCondition-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/BadCondition.cmake
copy Tests/RunCMake/{CMP0004 => File_Generate}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
File_Generate/CommandConflict-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/CommandConflict.cmake
create mode 100644 Tests/RunCMake/File_Generate/DebugEvaluate.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
File_Generate/EmptyCondition1-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/EmptyCondition1-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/EmptyCondition1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
File_Generate/EmptyCondition2-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/EmptyCondition2-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/EmptyCondition2.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
File_Generate/OutputConflict-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/OutputConflict-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/OutputConflict.cmake
create mode 100644 Tests/RunCMake/File_Generate/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/File_Generate/input.txt
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, master, updated. v2.8.11-202-g7cde91c
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 7cde91cc8c0d2a2152183c1bb40ebae36ce60307 (commit) via 015309fc9f87babaadc2510eb80298b1f2389e8c (commit) from be85fa4a8916819514ca5c5c01db14733d5b9bce (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=7cde91cc8c0d2a2152183c1bb40ebae36ce60307 commit 7cde91cc8c0d2a2152183c1bb40ebae36ce60307 Merge: be85fa4 015309f Author: Brad King AuthorDate: Tue May 28 10:42:23 2013 -0400 Commit: CMake Topic Stage CommitDate: Tue May 28 10:42:23 2013 -0400 Merge topic 'silence-vs6-warnings' 015309f Tests/CompileDefinitions: Avoid spaces in defines on VS 6 --- Summary of changes: Tests/CompileDefinitions/CMakeLists.txt|1 + .../add_definitions_command/CMakeLists.txt | 11 +-- .../CMakeLists.txt |4 +++- .../CompileDefinitions/target_prop/CMakeLists.txt |6 +- 4 files changed, 18 insertions(+), 4 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-2247-g898a30c
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 898a30ce6278153dc4c8d37363c4d6445800df43 (commit)
via 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a (commit)
from c14659fcdebb753d41f91b9498a246fd10486539 (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=898a30ce6278153dc4c8d37363c4d6445800df43
commit 898a30ce6278153dc4c8d37363c4d6445800df43
Merge: c14659f 3de9bb4
Author: Brad King
AuthorDate: Tue May 28 09:45:40 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 09:45:40 2013 -0400
Merge topic 'FindImageMagick-v6-includes' into next
3de9bb4 FindImageMagick: Find v6 include dir (#14174)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a
commit 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a
Author: Funda Wang
AuthorDate: Tue May 28 06:17:49 2013 +
Commit: Brad King
CommitDate: Tue May 28 09:43:29 2013 -0400
FindImageMagick: Find v6 include dir (#14174)
The header files of ImageMagick are now located at
/include/ImageMagick-6 instead of /include/ImageMagick.
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index cd97b38..02a5777 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
${ImageMagick_INCLUDE_DIRS}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
PATH_SUFFIXES
- ImageMagick
+ ImageMagick ImageMagick-6
DOC "Path to the ImageMagick include dir."
)
find_library(ImageMagick_${component}_LIBRARY
---
Summary of changes:
Modules/FindImageMagick.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-2245-gc14659f
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 c14659fcdebb753d41f91b9498a246fd10486539 (commit)
via a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139 (commit)
from 43e18bef9b0c6f6c4aba2c4b2ecbadbea05a8c3c (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=c14659fcdebb753d41f91b9498a246fd10486539
commit c14659fcdebb753d41f91b9498a246fd10486539
Merge: 43e18be a2099a8
Author: Brad King
AuthorDate: Tue May 28 09:34:06 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 09:34:06 2013 -0400
Merge topic 'SelectLibraryConfigurations-cached-library' into next
a2099a8 SelectLibraryConfigurations: Fix for cached _LIBRARY
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139
commit a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139
Author: Bjoern Thiel
AuthorDate: Tue May 28 05:25:00 2013 -0400
Commit: Brad King
CommitDate: Tue May 28 09:26:34 2013 -0400
SelectLibraryConfigurations: Fix for cached _LIBRARY
The line
set( ${basename}_LIBRARY )
removes the normal variable, but if the corresponding cached variable is
present then line
list( APPEND ${basename}_LIBRARY optimized "${_libname}" )
uses that and fails. Replace the original line with
set( ${basename}_LIBRARY "" )
to set the normal variable to empty instead of unsetting it.
diff --git a/Modules/SelectLibraryConfigurations.cmake
b/Modules/SelectLibraryConfigurations.cmake
index 62137bb..5bca064 100644
--- a/Modules/SelectLibraryConfigurations.cmake
+++ b/Modules/SelectLibraryConfigurations.cmake
@@ -62,7 +62,7 @@ macro( select_library_configurations basename )
# if the generator supports configuration types or CMAKE_BUILD_TYPE
# is set, then set optimized and debug options.
if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-set( ${basename}_LIBRARY )
+set( ${basename}_LIBRARY "" )
foreach( _libname IN LISTS ${basename}_LIBRARY_RELEASE )
list( APPEND ${basename}_LIBRARY optimized "${_libname}" )
endforeach()
---
Summary of changes:
Modules/SelectLibraryConfigurations.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-2243-g43e18be
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 43e18bef9b0c6f6c4aba2c4b2ecbadbea05a8c3c (commit)
via de80f5cd4919186102ed11436048911f08b786a8 (commit)
via 9c48b4aed4c460601b6df481d4b75906245807d7 (commit)
from 07908cfc7e1625c3b5c12209bc1db2170a2a47ed (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=43e18bef9b0c6f6c4aba2c4b2ecbadbea05a8c3c
commit 43e18bef9b0c6f6c4aba2c4b2ecbadbea05a8c3c
Merge: 07908cf de80f5c
Author: Stephen Kelly
AuthorDate: Tue May 28 04:19:22 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 04:19:22 2013 -0400
Merge topic 'VISIBILITY_PRESET-property' into next
de80f5c Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target
property.
9c48b4a Introduce target property _VISIBILITY_PRESET
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de80f5cd4919186102ed11436048911f08b786a8
commit de80f5cd4919186102ed11436048911f08b786a8
Author: Stephen Kelly
AuthorDate: Thu May 23 15:32:17 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue May 28 10:17:43 2013 +0200
Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target property.
This corresponds to the g++ and clang++
option -fvisibility-inlines-hidden on linux. On Windows with MinGW,
this corresponds to -fno-keep-inline-dllexport. That option is
not supported by clang currently.
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 486e2af..972d889 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -1,2 +1,4 @@
include(Compiler/Clang)
__compiler_clang(CXX)
+
+set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fvisibility-inlines-hidden")
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 879ab8f..9bee962 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -1,2 +1,8 @@
include(Compiler/GNU)
__compiler_gnu(CXX)
+
+if (WIN32)
+ set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fno-keep-inline-dllexport")
+else()
+ set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fvisibility-inlines-hidden")
+endif()
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 71dd3e9..dce1838 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1992,28 +1992,12 @@ void cmLocalGenerator::AddSharedFlags(std::string&
flags,
}
}
-//
-void cmLocalGenerator
-::AddVisibilityPresetFlags(std::string &flags, cmTarget* target,
-const char *lang)
+static void AddVisibilityCompileOption(std::string &flags, cmTarget* target,
+ cmLocalGenerator *lg, const char *lang)
{
- int targetType = target->GetType();
- bool suitableTarget = ((targetType == cmTarget::SHARED_LIBRARY)
- || (targetType == cmTarget::MODULE_LIBRARY)
- || (target->IsExecutableWithExports()));
-
- if (!suitableTarget)
-{
-return;
-}
-
- if (!lang)
-{
-return;
-}
std::string l(lang);
std::string compileOption = "CMAKE_" + l + "_COMPILE_OPTIONS_VISIBILITY";
- const char *opt = this->Makefile->GetDefinition(compileOption.c_str());
+ const char *opt = lg->GetMakefile()->GetDefinition(compileOption.c_str());
if (!opt)
{
return;
@@ -2037,7 +2021,50 @@ void cmLocalGenerator
return;
}
std::string option = std::string(opt) + prop;
- this->AppendFlags(flags, option.c_str());
+ lg->AppendFlags(flags, option.c_str());
+}
+
+static void AddInlineVisibilityCompileOption(std::string &flags,
+ cmTarget* target,
+ cmLocalGenerator *lg)
+{
+ std::string compileOption
+= "CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN";
+ const char *opt = lg->GetMakefile()->GetDefinition(compileOption.c_str());
+ if (!opt)
+{
+return;
+}
+
+ bool prop = target->GetPropertyAsBool("VISIBILITY_INLINES_HIDDEN");
+ if (!prop)
+{
+return;
+}
+ lg->AppendFlags(flags, opt);
+}
+
+//
+void cmLocalGenerator
+::AddVisibilityPresetFlags(std::string &flags, cmTarget* target,
+const char *lang)
+{
+ int targetType = target->GetType();
+ bool suitableTarget = ((targetType == cmTarget::SHARED_LIBRARY)
+ || (targetType == cmTarget::MODULE_LIBRARY)
+
[Cmake-commits] CMake branch, next, updated. v2.8.11-2240-g07908cf
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 07908cfc7e1625c3b5c12209bc1db2170a2a47ed (commit)
via 0663226c5e1907e8f2b1a4753b5ea70a4de7782c (commit)
from 5d1334e2699f8eaf0b63a78efb261252e39533e0 (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=07908cfc7e1625c3b5c12209bc1db2170a2a47ed
commit 07908cfc7e1625c3b5c12209bc1db2170a2a47ed
Merge: 5d1334e 0663226
Author: Stephen Kelly
AuthorDate: Tue May 28 04:17:00 2013 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 28 04:17:00 2013 -0400
Merge topic 'VISIBILITY_PREFIX-property' into next
0663226 Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target
property.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0663226c5e1907e8f2b1a4753b5ea70a4de7782c
commit 0663226c5e1907e8f2b1a4753b5ea70a4de7782c
Author: Stephen Kelly
AuthorDate: Thu May 23 15:32:17 2013 +0200
Commit: Stephen Kelly
CommitDate: Tue May 28 10:15:58 2013 +0200
Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target property.
This corresponds to the g++ and clang++
option -fvisibility-inlines-hidden on linux. On Windows with MinGW,
this corresponds to -fno-keep-inline-dllexport. That option is
not supported by clang currently.
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 486e2af..972d889 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -1,2 +1,4 @@
include(Compiler/Clang)
__compiler_clang(CXX)
+
+set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fvisibility-inlines-hidden")
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 879ab8f..9bee962 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -1,2 +1,8 @@
include(Compiler/GNU)
__compiler_gnu(CXX)
+
+if (WIN32)
+ set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fno-keep-inline-dllexport")
+else()
+ set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fvisibility-inlines-hidden")
+endif()
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 71dd3e9..dce1838 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1992,28 +1992,12 @@ void cmLocalGenerator::AddSharedFlags(std::string&
flags,
}
}
-//
-void cmLocalGenerator
-::AddVisibilityPresetFlags(std::string &flags, cmTarget* target,
-const char *lang)
+static void AddVisibilityCompileOption(std::string &flags, cmTarget* target,
+ cmLocalGenerator *lg, const char *lang)
{
- int targetType = target->GetType();
- bool suitableTarget = ((targetType == cmTarget::SHARED_LIBRARY)
- || (targetType == cmTarget::MODULE_LIBRARY)
- || (target->IsExecutableWithExports()));
-
- if (!suitableTarget)
-{
-return;
-}
-
- if (!lang)
-{
-return;
-}
std::string l(lang);
std::string compileOption = "CMAKE_" + l + "_COMPILE_OPTIONS_VISIBILITY";
- const char *opt = this->Makefile->GetDefinition(compileOption.c_str());
+ const char *opt = lg->GetMakefile()->GetDefinition(compileOption.c_str());
if (!opt)
{
return;
@@ -2037,7 +2021,50 @@ void cmLocalGenerator
return;
}
std::string option = std::string(opt) + prop;
- this->AppendFlags(flags, option.c_str());
+ lg->AppendFlags(flags, option.c_str());
+}
+
+static void AddInlineVisibilityCompileOption(std::string &flags,
+ cmTarget* target,
+ cmLocalGenerator *lg)
+{
+ std::string compileOption
+= "CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN";
+ const char *opt = lg->GetMakefile()->GetDefinition(compileOption.c_str());
+ if (!opt)
+{
+return;
+}
+
+ bool prop = target->GetPropertyAsBool("VISIBILITY_INLINES_HIDDEN");
+ if (!prop)
+{
+return;
+}
+ lg->AppendFlags(flags, opt);
+}
+
+//
+void cmLocalGenerator
+::AddVisibilityPresetFlags(std::string &flags, cmTarget* target,
+const char *lang)
+{
+ int targetType = target->GetType();
+ bool suitableTarget = ((targetType == cmTarget::SHARED_LIBRARY)
+ || (targetType == cmTarget::MODULE_LIBRARY)
+ || (target->IsExecutableWithExports()));
+
+ if (!suitableTarget)
+{
+return;
+}
+
+ if (!lan
[Cmake-commits] CMake branch, next, updated. v2.8.11-2238-g5d1334e
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 5d1334e2699f8eaf0b63a78efb261252e39533e0 (commit) via e1dee57c2700739579d4013629e5fd16a8b8f8e1 (commit) from 0bd5a450c3520855d35e9334e900cd23edef7ce2 (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=5d1334e2699f8eaf0b63a78efb261252e39533e0 commit 5d1334e2699f8eaf0b63a78efb261252e39533e0 Merge: 0bd5a45 e1dee57 Author: Stephen Kelly AuthorDate: Tue May 28 04:15:47 2013 -0400 Commit: CMake Topic Stage CommitDate: Tue May 28 04:15:47 2013 -0400 Merge topic 'VISIBILITY_PREFIX-property' into next e1dee57 Add missing lang param. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1dee57c2700739579d4013629e5fd16a8b8f8e1 commit e1dee57c2700739579d4013629e5fd16a8b8f8e1 Author: Stephen Kelly AuthorDate: Tue May 28 10:14:52 2013 +0200 Commit: Stephen Kelly CommitDate: Tue May 28 10:14:52 2013 +0200 Add missing lang param. diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 21c7323..84fd58c 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -143,7 +143,8 @@ public: const char* config); void AddCMP0018Flags(std::string &flags, cmTarget* target, std::string const& lang, const char *config); - void AddVisibilityPresetFlags(std::string &flags, cmTarget* target); + void AddVisibilityPresetFlags(std::string &flags, cmTarget* target, +const char *lang); void AddConfigVariableFlags(std::string& flags, const char* var, const char* config); ///! Append flags to a string. --- Summary of changes: Source/cmLocalGenerator.h |3 ++- 1 files changed, 2 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
