[Cmake-commits] CMake branch, next, updated. v2.8.11-2524-g4bf23b5
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 4bf23b574aa97ddd9723efbe3f72f8e1e0d81891 (commit)
via 3a7898abe28f55f5da3febb3397e5aa3f30f0e62 (commit)
from 6aa8810ffdff230ad09b5cba61fe746dad090b4d (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=4bf23b574aa97ddd9723efbe3f72f8e1e0d81891
commit 4bf23b574aa97ddd9723efbe3f72f8e1e0d81891
Merge: 6aa8810 3a7898a
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:05:45 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:05:45 2013 -0400
Merge topic 'test-genex-HEAD-target' into next
3a7898a Tests/IncludeDirectories: Export shared library symbol on Windows
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a7898abe28f55f5da3febb3397e5aa3f30f0e62
commit 3a7898abe28f55f5da3febb3397e5aa3f30f0e62
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 08:52:38 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 08:52:38 2013 -0400
Tests/IncludeDirectories: Export shared library symbol on Windows
The Watcom linker does not like to create shared libraries with no
exports.
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
index f388ef8..6673471 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
@@ -1,4 +1,6 @@
-
-int main() {
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int other() {
return 0;
}
---
Summary of changes:
.../TargetIncludeDirectories/other.cpp |6 --
1 files changed, 4 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-2526-g7c3f18f
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 7c3f18ff68824eab38cb6a2b47e76a9ae1b2e130 (commit) via 4d15c0b7c6f11c7486da7e760c59a1e7daabacab (commit) from 4bf23b574aa97ddd9723efbe3f72f8e1e0d81891 (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=7c3f18ff68824eab38cb6a2b47e76a9ae1b2e130 commit 7c3f18ff68824eab38cb6a2b47e76a9ae1b2e130 Merge: 4bf23b5 4d15c0b Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jun 5 09:08:57 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jun 5 09:08:57 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, next, updated. v2.8.11-2528-gf7ef08e
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 f7ef08ef7c24385595fd652bc83dac3b41e87683 (commit)
via 5b222354de7060af409d0d80aa06180ed1b3ac64 (commit)
from 7c3f18ff68824eab38cb6a2b47e76a9ae1b2e130 (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=f7ef08ef7c24385595fd652bc83dac3b41e87683
commit f7ef08ef7c24385595fd652bc83dac3b41e87683
Merge: 7c3f18f 5b22235
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:10:04 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 09:10:04 2013 -0400
Merge branch 'fix-genex-HEAD-target' into next
5b222354 Genex: Fix the HEAD target used for evaluated expressions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b222354de7060af409d0d80aa06180ed1b3ac64
commit 5b222354de7060af409d0d80aa06180ed1b3ac64
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Jun 3 23:53:29 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 09:05:00 2013 -0400
Genex: Fix the HEAD target used for evaluated expressions
If the expression $TARGET_PROPERTY:prop appears in the content
of a target property, the target that prop is read from is
the 'head target' of the expression. In contexts such as evaluating
the content of a target property during generation, such
as INCLUDE_DIRECTORIES, the 'head target' is the one on which the
initial request was made.
If evaluating a generator expression which is not a target property
content, the target must be explicitly specified. Such contexts
include add_custom_command and file(GENERATE). The content might
then look like
$TARGET_PROPERTY:tgt,prop
However, as there is no HeadTarget set, any generator expressions
evaluated as part of reading prop from tgt which do not specify
the tgt directly report an error.
Modify the logic of the TARGET_PROPERTY generator expression so
that in such contexts, the 'head target' is set to the appropriate
target which was first encountered.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index de6371a..a01a0f8 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -315,6 +315,7 @@ static const char* targetPropertyTransitiveWhitelist[] = {
std::string getLinkedTargetsContent(const std::vectorstd::string libraries,
cmTarget *target,
+ cmTarget *headTarget,
cmGeneratorExpressionContext *context,
cmGeneratorExpressionDAGChecker *dagChecker,
const std::string interfacePropertyName)
@@ -345,7 +346,7 @@ std::string getLinkedTargetsContent(const
std::vectorstd::string libraries,
std::string linkedTargetsContent = cge-Evaluate(context-Makefile,
context-Config,
context-Quiet,
- context-HeadTarget,
+ headTarget,
target,
dagChecker);
if (cge-GetHadContextSensitiveCondition())
@@ -538,6 +539,8 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
interfacePropertyName = INTERFACE_COMPILE_DEFINITIONS;
}
+cmTarget *headTarget = context-HeadTarget ? context-HeadTarget : target;
+
const char **transBegin = targetPropertyTransitiveWhitelist;
const char **transEnd = targetPropertyTransitiveWhitelist
+ (sizeof(targetPropertyTransitiveWhitelist) /
@@ -547,11 +550,12 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
const cmTarget::LinkInterface *iface = target-GetLinkInterface(
context-Config,
-context-HeadTarget);
+headTarget);
if(iface)
{
linkedTargetsContent =
getLinkedTargetsContent(iface-Libraries, target,
+ headTarget,
context, dagChecker,
interfacePropertyName);
}
@@ -561,11 +565,12 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
const cmTarget::LinkImplementation *impl = target-GetLinkImplementation(
[Cmake-commits] CMake branch, master, updated. v2.8.11-294-g2cd8a6a
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 2cd8a6a3c6d505674e113345c58edfb19bf8dc2e (commit) via 9efe35906af4447533d9e594df539e71293437dd (commit) via db15713f057ad4896eab07f847870f5ab42f8be1 (commit) from 93317839b0aa7b47e37aad96ef3e0d4cfea236ba (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=2cd8a6a3c6d505674e113345c58edfb19bf8dc2e commit 2cd8a6a3c6d505674e113345c58edfb19bf8dc2e Merge: 9331783 9efe359 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jun 5 09:39:12 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jun 5 09:39:12 2013 -0400 Merge topic 'cleanups' 9efe359 Add some spaces to the INCLUDE_DIRECTORIES documentation. db15713 Remove unused cmAddDefinitionsCommand::ParseDefinition method. --- Summary of changes: Source/cmAddDefinitionsCommand.h |2 -- Source/cmMakefile.cxx| 12 ++-- 2 files changed, 6 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
[Cmake-commits] CMake branch, master, updated. v2.8.11-291-g9331783
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 93317839b0aa7b47e37aad96ef3e0d4cfea236ba (commit)
via a984f3257e95f29a72da6566859d4c6a8a5d749b (commit)
from ff8917fdd2e8739a46c84ab03911258c23779744 (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=93317839b0aa7b47e37aad96ef3e0d4cfea236ba
commit 93317839b0aa7b47e37aad96ef3e0d4cfea236ba
Merge: ff8917f a984f32
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:39:05 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:39:05 2013 -0400
Merge topic 'add_compile_options-command'
a984f32 Introduce add_compile_options command.
diff --cc Source/cmTarget.cxx
index ab051d0,eb1e3b2..7d25b91
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -1640,11 -1611,15 +1640,19 @@@ void cmTarget::SetMakefile(cmMakefile*
{
this-InsertInclude(*it);
}
+ const std::vectorcmValueWithOrigin parentOptions =
+ this-Makefile-GetCompileOptionsEntries();
+
+ for (std::vectorcmValueWithOrigin::const_iterator it
+ = parentOptions.begin(); it != parentOptions.end(); ++it)
+ {
+ this-InsertCompileOption(*it);
+ }
+ this-SetPropertyDefault(C_VISIBILITY_PRESET, 0);
+ this-SetPropertyDefault(CXX_VISIBILITY_PRESET, 0);
+ this-SetPropertyDefault(VISIBILITY_INLINES_HIDDEN, 0);
+
if(this-TargetTypeValue == cmTarget::SHARED_LIBRARY
|| this-TargetTypeValue == cmTarget::MODULE_LIBRARY)
{
---
Summary of changes:
...sCommand.cxx = cmAddCompileOptionsCommand.cxx} | 11 +--
...ptionCommand.h = cmAddCompileOptionsCommand.h} | 46 +++-
Source/cmCommands.cxx |2 +
Source/cmMakefile.cxx | 60
Source/cmMakefile.h|6 ++
Source/cmTarget.cxx| 10 +++-
.../add_compile_options/CMakeLists.txt | 14 +
Tests/CMakeCommands/add_compile_options/main.cpp | 11
8 files changed, 126 insertions(+), 34 deletions(-)
copy Source/{cmAddDefinitionsCommand.cxx = cmAddCompileOptionsCommand.cxx}
(75%)
copy Source/{cmOptionCommand.h = cmAddCompileOptionsCommand.h} (52%)
create mode 100644 Tests/CMakeCommands/add_compile_options/CMakeLists.txt
create mode 100644 Tests/CMakeCommands/add_compile_options/main.cpp
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-298-gbf57982
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 bf57982f7b52b8ed7a3da4099442d6cda36280bb (commit) via b62d440ea8cf16e1eab3d8fec5f36abdee0f4bab (commit) from 21b10265419800942ed0806f0e0f5cf6da260bad (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=bf57982f7b52b8ed7a3da4099442d6cda36280bb commit bf57982f7b52b8ed7a3da4099442d6cda36280bb Merge: 21b1026 b62d440 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jun 5 09:39:27 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jun 5 09:39:27 2013 -0400 Merge topic 'doc-CMAKE_PARENT_LIST_FILE' b62d440 Docs: Clarify CMAKE_PARENT_LIST_FILE (#14194) --- Summary of changes: Source/cmDocumentVariables.cxx | 11 ++- 1 files changed, 6 insertions(+), 5 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-303-gc02f01b
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 c02f01b0397dc39346d1d07dd03c4515590482b3 (commit) via d26800bc40a103d90366da176ad68ed92f21daab (commit) from 31a02203977fdbb518bf796ceb1f9170046456dd (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=c02f01b0397dc39346d1d07dd03c4515590482b3 commit c02f01b0397dc39346d1d07dd03c4515590482b3 Merge: 31a0220 d26800b Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jun 5 09:39:48 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jun 5 09:39:48 2013 -0400 Merge topic 'fix-path-root-dot-dot' d26800b get_filename_component: Test ABSOLUTE of .. after root component --- Summary of changes: .../get_filename_component/KnownComponents.cmake |5 + 1 files changed, 5 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-301-g31a0220
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 31a02203977fdbb518bf796ceb1f9170046456dd (commit) via c91e88d0e15f38616284f12fc0f2152ac6c0562c (commit) via 6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b (commit) from bf57982f7b52b8ed7a3da4099442d6cda36280bb (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=31a02203977fdbb518bf796ceb1f9170046456dd commit 31a02203977fdbb518bf796ceb1f9170046456dd Merge: bf57982 c91e88d Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jun 5 09:39:41 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jun 5 09:39:41 2013 -0400 Merge topic 'update-kwsys' c91e88d Merge branch 'upstream-kwsys' into update-kwsys 6dc3dd9 KWSys 2013-06-03 (d79a792e) --- Summary of changes: Source/kwsys/SystemTools.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-296-g21b1026
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 21b10265419800942ed0806f0e0f5cf6da260bad (commit)
via 273ecab96d47d6ddba129be6200bc93ba7910b8c (commit)
from 2cd8a6a3c6d505674e113345c58edfb19bf8dc2e (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=21b10265419800942ed0806f0e0f5cf6da260bad
commit 21b10265419800942ed0806f0e0f5cf6da260bad
Merge: 2cd8a6a 273ecab
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:39:18 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:39:18 2013 -0400
Merge topic 'suppress-unused-cli-with-value-in-cache'
273ecab CLI: Suppress the unused warning if the key value pair is cached.
---
Summary of changes:
Source/cmCacheManager.cxx |4 +++
Source/cmake.cxx | 13 -
Tests/CMakeLists.txt | 28
Tests/WarnUnusedCliUnused/CMakeLists.txt |9 ++
.../empty.cpp |0
5 files changed, 42 insertions(+), 12 deletions(-)
create mode 100644 Tests/WarnUnusedCliUnused/CMakeLists.txt
copy Tests/{IncludeDirectories/TargetIncludeDirectories =
WarnUnusedCliUnused}/empty.cpp (100%)
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-289-gff8917f
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 ff8917fdd2e8739a46c84ab03911258c23779744 (commit)
via cd1fa537a03377974a4d0a27e592785f931a41e5 (commit)
via 0e9f4bc00c6b26f254e74063e4026ac33b786513 (commit)
from 4d15c0b7c6f11c7486da7e760c59a1e7daabacab (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=ff8917fdd2e8739a46c84ab03911258c23779744
commit ff8917fdd2e8739a46c84ab03911258c23779744
Merge: 4d15c0b cd1fa53
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:38:59 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:38:59 2013 -0400
Merge topic 'VISIBILITY_PRESET-property'
cd1fa53 Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target
property.
0e9f4bc Introduce target property LANG_VISIBILITY_PRESET
diff --cc Source/cmNinjaTargetGenerator.cxx
index 6f912b8,778f86a..ae18a48
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@@ -150,10 -150,13 +150,13 @@@ cmNinjaTargetGenerator::ComputeFlagsFor
language.c_str(),
this-GetConfigName());
+ this-LocalGenerator-AddVisibilityPresetFlags(flags, this-Target,
+ language.c_str());
+
// Add include directory flags.
+ const char *config = this-Makefile-GetDefinition(CMAKE_BUILD_TYPE);
{
std::vectorstd::string includes;
- const char *config = this-Makefile-GetDefinition(CMAKE_BUILD_TYPE);
this-LocalGenerator-GetIncludeDirectories(includes,
this-GeneratorTarget,
language.c_str(), config);
---
Summary of changes:
Modules/Compiler/Clang-CXX.cmake |2 +
Modules/Compiler/Clang.cmake |1 +
Modules/Compiler/GNU-CXX.cmake | 10 +++
Modules/Compiler/GNU.cmake |3 +
Modules/Compiler/Intel-C.cmake |4 +
Modules/Compiler/Intel-CXX.cmake |4 +
Source/cmGlobalXCodeGenerator.cxx |3 +
Source/cmLocalGenerator.cxx| 75
Source/cmLocalGenerator.h |2 +
Source/cmMakefileTargetGenerator.cxx |3 +
Source/cmNinjaTargetGenerator.cxx |3 +
Source/cmTarget.cxx| 33 +
Tests/Module/GenerateExportHeader/CMakeLists.txt |2 +
.../visibility_preset/CMakeLists.txt | 17 +
.../visibility_preset/main.cpp |9 +++
.../visibility_preset/visibility_preset.cpp|7 ++
.../visibility_preset/visibility_preset.h | 13
Tests/RunCMake/CMakeLists.txt | 16
.../CMakeLists.txt |0
.../PropertyTypo-result.txt} |0
.../VisibilityPreset/PropertyTypo-stderr.txt |1 +
Tests/RunCMake/VisibilityPreset/PropertyTypo.cmake |3 +
Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake |3 +
.../foo.c = RunCMake/VisibilityPreset/lib.cpp}|3 +-
24 files changed, 216 insertions(+), 1 deletions(-)
create mode 100644
Tests/Module/GenerateExportHeader/visibility_preset/CMakeLists.txt
create mode 100644 Tests/Module/GenerateExportHeader/visibility_preset/main.cpp
create mode 100644
Tests/Module/GenerateExportHeader/visibility_preset/visibility_preset.cpp
create mode 100644
Tests/Module/GenerateExportHeader/visibility_preset/visibility_preset.h
copy Tests/RunCMake/{PositionIndependentCode =
VisibilityPreset}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
VisibilityPreset/PropertyTypo-result.txt} (100%)
create mode 100644 Tests/RunCMake/VisibilityPreset/PropertyTypo-stderr.txt
create mode 100644 Tests/RunCMake/VisibilityPreset/PropertyTypo.cmake
create mode 100644 Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
copy Tests/{SourceGroups/sub1/foo.c = RunCMake/VisibilityPreset/lib.cpp} (56%)
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-2537-g31b189d
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 31b189d2a89992ba01e90043d6383e54e4156ba7 (commit) via aa025cc60a56da31dfe8461faec0dc3aa517cc10 (commit) via c02f01b0397dc39346d1d07dd03c4515590482b3 (commit) via 31a02203977fdbb518bf796ceb1f9170046456dd (commit) via bf57982f7b52b8ed7a3da4099442d6cda36280bb (commit) via 21b10265419800942ed0806f0e0f5cf6da260bad (commit) via 2cd8a6a3c6d505674e113345c58edfb19bf8dc2e (commit) via 93317839b0aa7b47e37aad96ef3e0d4cfea236ba (commit) via ff8917fdd2e8739a46c84ab03911258c23779744 (commit) from f7ef08ef7c24385595fd652bc83dac3b41e87683 (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=31b189d2a89992ba01e90043d6383e54e4156ba7 commit 31b189d2a89992ba01e90043d6383e54e4156ba7 Merge: f7ef08e aa025cc Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jun 5 09:38:17 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jun 5 09:38:17 2013 -0400 Merge branch 'master' into next --- Summary of changes: 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-307-gd3c8688
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 d3c8688ecdcdcea89373af2d6a30c4ba66315465 (commit)
via 5b222354de7060af409d0d80aa06180ed1b3ac64 (commit)
from aa025cc60a56da31dfe8461faec0dc3aa517cc10 (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=d3c8688ecdcdcea89373af2d6a30c4ba66315465
commit d3c8688ecdcdcea89373af2d6a30c4ba66315465
Merge: aa025cc 5b22235
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:54:20 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:54:20 2013 -0400
Merge topic 'fix-genex-HEAD-target'
5b22235 Genex: Fix the HEAD target used for evaluated expressions
diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index 5e7d00d,a01a0f8..28f749d
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -723,12 -538,9 +724,14 @@@ static const struct TargetPropertyNode
{
interfacePropertyName = INTERFACE_COMPILE_DEFINITIONS;
}
+else if (propertyName == INTERFACE_COMPILE_OPTIONS
+|| propertyName == COMPILE_OPTIONS)
+ {
+ interfacePropertyName = INTERFACE_COMPILE_OPTIONS;
+ }
+ cmTarget *headTarget = context-HeadTarget ? context-HeadTarget : target;
+
const char **transBegin = targetPropertyTransitiveWhitelist;
const char **transEnd = targetPropertyTransitiveWhitelist
+ (sizeof(targetPropertyTransitiveWhitelist) /
diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 088725b,bcfbe3c..6919261
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,26 -109,12 +109,31 @@@ set_property(TARGET libbad APPEND PROPE
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/bad
)
+ add_library(lib6 SHARED other.cpp)
+ add_library(lib7 SHARED other.cpp)
+ target_link_libraries(lib7
$$STREQUAL:$TARGET_PROPERTY:TYPE,EXECUTABLE:lib6)
+ target_include_directories(lib7 PUBLIC
$$STREQUAL:$TARGET_PROPERTY:TYPE,EXECUTABLE:/lib7/include)
+ add_custom_target(head_target_test some_bogus_custom_tool
\$TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES$TARGET_PROPERTY:lib7,INTERFACE_INCLUDE_DIRECTORIES\)
+add_library(includes_source_good empty.cpp)
+target_include_directories(includes_source_good
+ INTERFACE
+${CMAKE_CURRENT_BINARY_DIR}/good
+${CMAKE_CURRENT_BINARY_DIR}/othergood/
+)
+add_library(includes_source_bad empty.cpp)
+target_include_directories(includes_source_bad
+ INTERFACE
+${CMAKE_CURRENT_BINARY_DIR}/bad
+)
+
+add_library(includes_proxy SHARED empty.cpp)
+target_link_libraries(includes_proxy includes_source_good)
+target_link_libraries(includes_proxy LINK_INTERFACE_LIBRARIES
includes_source_bad)
+add_executable(copy_includes copy_includes.cpp)
+target_include_directories(copy_includes PRIVATE
$TARGET_PROPERTY:includes_proxy,INCLUDE_DIRECTORIES)
+
+
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp #include \common.h\\n)
add_library(lib5 ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp)
---
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx | 13 +
.../TargetIncludeDirectories/CMakeLists.txt|5 +
.../{empty.cpp = other.cpp} |3 +--
3 files changed, 15 insertions(+), 6 deletions(-)
copy Tests/IncludeDirectories/TargetIncludeDirectories/{empty.cpp =
other.cpp} (76%)
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-305-gaa025cc
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 aa025cc60a56da31dfe8461faec0dc3aa517cc10 (commit) via 21a0beacc1d8c452f13453b22f36c91fbbd0a182 (commit) from c02f01b0397dc39346d1d07dd03c4515590482b3 (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=aa025cc60a56da31dfe8461faec0dc3aa517cc10 commit aa025cc60a56da31dfe8461faec0dc3aa517cc10 Merge: c02f01b 21a0bea Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jun 5 09:39:52 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jun 5 09:39:52 2013 -0400 Merge topic 'xcode-framework-paths' 21a0bea Xcode: Fix framework search paths in STATIC library targets (#14191) --- Summary of changes: Source/cmGlobalXCodeGenerator.cxx | 18 +++--- 1 files changed, 7 insertions(+), 11 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-2541-gfeba0b9
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 feba0b9f7667f7307b8842fe50b50553ac4fce75 (commit)
via ff01f8b60025cca88ebcba9b83ab9492b1521c2c (commit)
from c6040dce84c5181be9090e00e9d34f8b69a8f75a (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=feba0b9f7667f7307b8842fe50b50553ac4fce75
commit feba0b9f7667f7307b8842fe50b50553ac4fce75
Merge: c6040dc ff01f8b
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Jun 5 23:34:00 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 23:34:00 2013 -0400
Merge topic 'rpath-on-mac' into next
ff01f8b OS X: Improvements for getting install name of dylib.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff01f8b60025cca88ebcba9b83ab9492b1521c2c
commit ff01f8b60025cca88ebcba9b83ab9492b1521c2c
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Jun 5 21:31:11 2013 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Jun 5 21:31:11 2013 -0600
OS X: Improvements for getting install name of dylib.
In the case of a multi-arch dylib where none of the architectures
is the host architecture, otool -D returned multiple install names.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 803d0da..21c361d 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2425,7 +2425,10 @@ bool cmSystemTools::GuessLibraryInstallName(std::string
const fullPath,
RunSingleCommand(cmds, output, 0, 0, OUTPUT_NONE);
std::vectorstd::string strs = cmSystemTools::tokenize(output, \n);
- if(strs.size() == 2)
+ // otool returns extra lines reporting multiple install names
+ // in case the binary is multi-arch and none of the architectures
+ // is native (e.g. i386;ppc on x86_64)
+ if(strs.size() = 2)
{
soname = strs[1];
return true;
---
Summary of changes:
Source/cmSystemTools.cxx |5 -
1 files changed, 4 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-308-gbb879bc
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 bb879bcf2dd8a65eeb285ef67aa72c16aab01938 (commit) from d3c8688ecdcdcea89373af2d6a30c4ba66315465 (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=bb879bcf2dd8a65eeb285ef67aa72c16aab01938 commit bb879bcf2dd8a65eeb285ef67aa72c16aab01938 Author: Kitware Robot kwro...@kitware.com AuthorDate: Thu Jun 6 00:01:04 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Thu Jun 6 00:01:04 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d5e0330..b437077 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 20130605) +set(CMake_VERSION_TWEAK 20130606) #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
