[Cmake-commits] CMake branch, next, updated. v2.8.11-2475-g075a0ec
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 075a0ec362f3c24721db0be33964ae8ce50d8c43 (commit)
via c6181fb6376481dd59423b84d08db571cf989661 (commit)
from 0e4620d1ceea0528a1d1b019c576c55bbe5d5520 (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=075a0ec362f3c24721db0be33964ae8ce50d8c43
commit 075a0ec362f3c24721db0be33964ae8ce50d8c43
Merge: 0e4620d c6181fb
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:03:29 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:03:29 2013 -0400
Merge topic 'fix-genex-HEAD-target' into next
c6181fb Genex: Fix the HEAD target used for evaluated expressions.
diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index 28f749d,a01a0f8..da3b311
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -724,14 -538,9 +724,16 @@@ 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;
+ cmTarget *headTarget = context-HeadTarget ? context-HeadTarget : target;
+
const char **transBegin = targetPropertyTransitiveWhitelist;
const char **transEnd = targetPropertyTransitiveWhitelist
+ (sizeof(targetPropertyTransitiveWhitelist) /
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6181fb6376481dd59423b84d08db571cf989661
commit c6181fb6376481dd59423b84d08db571cf989661
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Jun 3 23:53:29 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:03:15 2013 +0200
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
[Cmake-commits] CMake branch, next, updated. v2.8.11-2473-g0e4620d
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 0e4620d1ceea0528a1d1b019c576c55bbe5d5520 (commit)
via 4fab70449017394d92908f0cbd2b08ae0a50ecf7 (commit)
from 574f8c7fdc0c6660c7a38322de332af7af73a266 (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=0e4620d1ceea0528a1d1b019c576c55bbe5d5520
commit 0e4620d1ceea0528a1d1b019c576c55bbe5d5520
Merge: 574f8c7 4fab704
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:03:08 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:03:08 2013 -0400
Merge topic 'fix-genex-HEAD-target' into next
4fab704 Use the same headTarget to evaluate linked content.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fab70449017394d92908f0cbd2b08ae0a50ecf7
commit 4fab70449017394d92908f0cbd2b08ae0a50ecf7
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 11:01:17 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:01:58 2013 +0200
Use the same headTarget to evaluate linked content.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index c14ea12..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())
@@ -554,6 +555,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
linkedTargetsContent =
getLinkedTargetsContent(iface-Libraries, target,
+ headTarget,
context, dagChecker,
interfacePropertyName);
}
@@ -568,6 +570,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
linkedTargetsContent =
getLinkedTargetsContent(impl-Libraries, target,
+ headTarget,
context, dagChecker,
interfacePropertyName);
}
---
Summary of changes:
Source/cmGeneratorExpressionEvaluator.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, next, updated. v2.8.11-2477-gee095cc
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 ee095cc257897a3d3a2acd629a21ce5ed9cdea7a (commit)
via 18c53b324418331c1c9cb7fc365d5ff5e1f7f945 (commit)
from 075a0ec362f3c24721db0be33964ae8ce50d8c43 (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=ee095cc257897a3d3a2acd629a21ce5ed9cdea7a
commit ee095cc257897a3d3a2acd629a21ce5ed9cdea7a
Merge: 075a0ec 18c53b3
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:08:11 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:08:11 2013 -0400
Merge topic 'test-genex-HEAD-target' into next
18c53b3 Test that evaluating target properties does not result in errors.
diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 088725b,ec9a8cf..66df404
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,26 -109,14 +109,33 @@@ 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
$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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18c53b324418331c1c9cb7fc365d5ff5e1f7f945
commit 18c53b324418331c1c9cb7fc365d5ff5e1f7f945
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 10:52:56 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:07:46 2013 +0200
Test that evaluating target properties does not result in errors.
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index ad6671f..ec9a8cf 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -109,6 +109,13 @@ set_property(TARGET libbad APPEND PROPERTY
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 $TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES
+$TARGET_PROPERTY:lib7,INTERFACE_INCLUDE_DIRECTORIES
+)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp #include \common.h\\n)
add_library(lib5 ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp)
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
new file mode 100644
index 000..f388ef8
--- /dev/null
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
@@ -0,0 +1,4 @@
+
+int main() {
+ return 0;
+}
---
Summary of changes:
.../TargetIncludeDirectories/CMakeLists.txt|7 +++
.../TargetIncludeDirectories/other.cpp}|5 ++---
2 files changed, 9 insertions(+), 3 deletions(-)
copy Tests/{TarTest/TestTarExec.cxx =
IncludeDirectories/TargetIncludeDirectories/other.cpp} (53%)
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-2479-g754f9c6
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 754f9c6dcc75e6b95861a7ad26f51cc0b7bd7747 (commit)
via 2920c8b3bfff6465df9e6cc6e17c3a6e80bdaf3f (commit)
from ee095cc257897a3d3a2acd629a21ce5ed9cdea7a (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=754f9c6dcc75e6b95861a7ad26f51cc0b7bd7747
commit 754f9c6dcc75e6b95861a7ad26f51cc0b7bd7747
Merge: ee095cc 2920c8b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:10:56 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:10:56 2013 -0400
Merge topic 'fix-genex-HEAD-target' into next
2920c8b Revert Genex: Fix the HEAD target used for evaluated expressions.
diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index da3b311,de6371a..02acb9d
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -724,16 -537,7 +723,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;
- cmTarget *headTarget = context-HeadTarget ? context-HeadTarget : target;
-
const char **transBegin = targetPropertyTransitiveWhitelist;
const char **transEnd = targetPropertyTransitiveWhitelist
+ (sizeof(targetPropertyTransitiveWhitelist) /
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2920c8b3bfff6465df9e6cc6e17c3a6e80bdaf3f
commit 2920c8b3bfff6465df9e6cc6e17c3a6e80bdaf3f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 11:10:28 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:10:28 2013 +0200
Revert Genex: Fix the HEAD target used for evaluated expressions.
This reverts commit c6181fb6376481dd59423b84d08db571cf989661.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index a01a0f8..de6371a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -315,7 +315,6 @@ static const char* targetPropertyTransitiveWhitelist[] = {
std::string getLinkedTargetsContent(const std::vectorstd::string libraries,
cmTarget *target,
- cmTarget *headTarget,
cmGeneratorExpressionContext *context,
cmGeneratorExpressionDAGChecker *dagChecker,
const std::string interfacePropertyName)
@@ -346,7 +345,7 @@ std::string getLinkedTargetsContent(const
std::vectorstd::string libraries,
std::string linkedTargetsContent = cge-Evaluate(context-Makefile,
context-Config,
context-Quiet,
- headTarget,
+ context-HeadTarget,
target,
dagChecker);
if (cge-GetHadContextSensitiveCondition())
@@ -539,8 +538,6 @@ 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) /
@@ -550,12 +547,11 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
const cmTarget::LinkInterface *iface = target-GetLinkInterface(
context-Config,
-headTarget);
+context-HeadTarget);
if(iface)
{
linkedTargetsContent =
getLinkedTargetsContent(iface-Libraries, target,
- headTarget,
context, dagChecker,
interfacePropertyName);
}
@@ -565,12 +561,11 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
const cmTarget::LinkImplementation *impl = target-GetLinkImplementation(
context-Config,
-
[Cmake-commits] CMake branch, next, updated. v2.8.11-2482-gc4d832f
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 c4d832ff9d98d6aca1390f7c44a79f9e4ba41ff7 (commit)
via 316b2706f0c83ee9a0f175f8f509f56cde470d21 (commit)
via a53a50537d2289ff42f2e0c550a9944e25ce857d (commit)
from 754f9c6dcc75e6b95861a7ad26f51cc0b7bd7747 (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=c4d832ff9d98d6aca1390f7c44a79f9e4ba41ff7
commit c4d832ff9d98d6aca1390f7c44a79f9e4ba41ff7
Merge: 754f9c6 316b270
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:12:11 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:12:11 2013 -0400
Merge topic 'fix-genex-HEAD-target' into next
316b270 Revert Genex: Fix the HEAD target used for evaluated expressions.
a53a5053 Revert Use the same headTarget to evaluate linked content.
diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index 02acb9d,de6371a..5e7d00d
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -723,14 -537,7 +723,12 @@@ 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) /
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=316b2706f0c83ee9a0f175f8f509f56cde470d21
commit 316b2706f0c83ee9a0f175f8f509f56cde470d21
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 11:11:40 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:11:40 2013 +0200
Revert Genex: Fix the HEAD target used for evaluated expressions.
This reverts commit a53c6281905717b1e63aadf98ef34c699d3f9ff8.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index c14ea12..de6371a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -538,8 +538,6 @@ 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) /
@@ -549,7 +547,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
const cmTarget::LinkInterface *iface = target-GetLinkInterface(
context-Config,
-headTarget);
+context-HeadTarget);
if(iface)
{
linkedTargetsContent =
@@ -563,7 +561,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
const cmTarget::LinkImplementation *impl = target-GetLinkImplementation(
context-Config,
-headTarget);
+context-HeadTarget);
if(impl)
{
linkedTargetsContent =
@@ -616,7 +614,7 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
std::string result = cge-Evaluate(context-Makefile,
context-Config,
context-Quiet,
-headTarget,
+context-HeadTarget,
target,
dagChecker);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a53a50537d2289ff42f2e0c550a9944e25ce857d
commit a53a50537d2289ff42f2e0c550a9944e25ce857d
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 11:11:36 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:11:36 2013 +0200
Revert Use the same headTarget to evaluate linked content.
This reverts commit 4fab70449017394d92908f0cbd2b08ae0a50ecf7.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
[Cmake-commits] CMake branch, next, updated. v2.8.11-2484-g5ea0e34
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 5ea0e34b8dbfc8c5a12455121b8826ba270e26ef (commit)
via d1d4dac774c333141ac4a7203d8b243e18530669 (commit)
from c4d832ff9d98d6aca1390f7c44a79f9e4ba41ff7 (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=5ea0e34b8dbfc8c5a12455121b8826ba270e26ef
commit 5ea0e34b8dbfc8c5a12455121b8826ba270e26ef
Merge: c4d832f d1d4dac
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:13:52 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:13:52 2013 -0400
Merge topic 'fix-genex-HEAD-target' into next
d1d4dac 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) /
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1d4dac774c333141ac4a7203d8b243e18530669
commit d1d4dac774c333141ac4a7203d8b243e18530669
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Jun 3 23:53:29 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:12:45 2013 +0200
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
[Cmake-commits] CMake branch, next, updated. v2.8.11-2486-gaa343b9
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 aa343b9cf52ff1bf2a19977311101d6314b33160 (commit)
via 02e9888b64ad50a78b4589c65a9d865f72f3f2fb (commit)
from 5ea0e34b8dbfc8c5a12455121b8826ba270e26ef (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=aa343b9cf52ff1bf2a19977311101d6314b33160
commit aa343b9cf52ff1bf2a19977311101d6314b33160
Merge: 5ea0e34 02e9888
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:18:57 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:18:57 2013 -0400
Merge topic 'test-genex-HEAD-target' into next
02e9888 Revert Test that evaluating target properties does not result in
errors.
diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 66df404,ad6671f..088725b
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,33 -109,7 +109,26 @@@ 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
$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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02e9888b64ad50a78b4589c65a9d865f72f3f2fb
commit 02e9888b64ad50a78b4589c65a9d865f72f3f2fb
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 11:17:44 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:17:44 2013 +0200
Revert Test that evaluating target properties does not result in errors.
This reverts commit 18c53b324418331c1c9cb7fc365d5ff5e1f7f945.
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index ec9a8cf..ad6671f 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -109,13 +109,6 @@ set_property(TARGET libbad APPEND PROPERTY
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 $TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES
-$TARGET_PROPERTY:lib7,INTERFACE_INCLUDE_DIRECTORIES
-)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp #include \common.h\\n)
add_library(lib5 ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp)
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
deleted file mode 100644
index f388ef8..000
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-int main() {
- return 0;
-}
---
Summary of changes:
.../TargetIncludeDirectories/CMakeLists.txt|7 ---
.../TargetIncludeDirectories/other.cpp |4
2 files changed, 0 insertions(+), 11 deletions(-)
delete mode 100644 Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
[Cmake-commits] CMake branch, next, updated. v2.8.11-2488-gb0ae429
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 b0ae429555f089c605573ed026cc184a6a710af8 (commit)
via 945839f323a1f034969950e353c44b6fa62414e1 (commit)
from aa343b9cf52ff1bf2a19977311101d6314b33160 (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=b0ae429555f089c605573ed026cc184a6a710af8
commit b0ae429555f089c605573ed026cc184a6a710af8
Merge: aa343b9 945839f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:20:51 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:20:51 2013 -0400
Merge topic 'test-genex-HEAD-target' into next
945839f Test that evaluating target properties does not result in errors.
diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 088725b,ec9a8cf..66df404
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,26 -109,14 +109,33 @@@ 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
$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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=945839f323a1f034969950e353c44b6fa62414e1
commit 945839f323a1f034969950e353c44b6fa62414e1
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 10:52:56 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:14:11 2013 +0200
Test that evaluating target properties does not result in errors.
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index ad6671f..ec9a8cf 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -109,6 +109,13 @@ set_property(TARGET libbad APPEND PROPERTY
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 $TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES
+$TARGET_PROPERTY:lib7,INTERFACE_INCLUDE_DIRECTORIES
+)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp #include \common.h\\n)
add_library(lib5 ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp)
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
new file mode 100644
index 000..f388ef8
--- /dev/null
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
@@ -0,0 +1,4 @@
+
+int main() {
+ return 0;
+}
---
Summary of changes:
.../TargetIncludeDirectories/CMakeLists.txt|7 +++
.../TargetIncludeDirectories/other.cpp}|5 ++---
2 files changed, 9 insertions(+), 3 deletions(-)
copy Tests/{TarTest/TestTarExec.cxx =
IncludeDirectories/TargetIncludeDirectories/other.cpp} (53%)
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-2491-g4798588
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 4798588d2f62f60cc2b34f2d45a1f34de80779be (commit)
via a984f3257e95f29a72da6566859d4c6a8a5d749b (commit)
via 00c3840cc8c36adea76c6e833a9e2069645aec8a (commit)
from b0ae429555f089c605573ed026cc184a6a710af8 (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=4798588d2f62f60cc2b34f2d45a1f34de80779be
commit 4798588d2f62f60cc2b34f2d45a1f34de80779be
Merge: b0ae429 a984f32
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:38:48 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:38:48 2013 -0400
Merge topic 'add_compile_options-command' into next
a984f32 Introduce add_compile_options command.
00c3840 CMake Nightly Date Stamp
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)
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a984f3257e95f29a72da6566859d4c6a8a5d749b
commit a984f3257e95f29a72da6566859d4c6a8a5d749b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 10:30:24 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:36:55 2013 +0200
Introduce add_compile_options command.
This command is similar to add_definitions, in that it affects
the compile options of all targets which follow it. The implementation
is similar to the implementation of the include_directories command,
in that it is based on populating a COMPILE_OPTIONS directory property
and using that to initialize the same property on targets.
Unlike the include_directories command however, the add_compile_options
command does not affect previously defined targets. That is, in
the following code, foo will not be compiled with -Wall, but bar
will be:
add_library(foo ...)
add_compile_options(-Wall)
add_library(bar ...)
diff --git a/Source/cmAddCompileOptionsCommand.cxx
b/Source/cmAddCompileOptionsCommand.cxx
new file mode 100644
index 000..a6c3c00
--- /dev/null
+++ b/Source/cmAddCompileOptionsCommand.cxx
@@ -0,0 +1,28 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2013 Stephen Kelly steve...@gmail.com
+
+ 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 cmAddCompileOptionsCommand.h
+
+bool cmAddCompileOptionsCommand
+::InitialPass(std::vectorstd::string const args, cmExecutionStatus )
+{
+ if(args.size() 1 )
+{
+return true;
+}
+
+ for(std::vectorstd::string::const_iterator i = args.begin();
+ i != args.end(); ++i)
+{
+this-Makefile-AddCompileOption(i-c_str());
+}
+ return true;
+}
diff --git a/Source/cmAddCompileOptionsCommand.h
b/Source/cmAddCompileOptionsCommand.h
new file mode 100644
index 000..4504795
--- /dev/null
+++ b/Source/cmAddCompileOptionsCommand.h
@@ -0,0 +1,72 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2013 Stephen Kelly steve...@gmail.com
+
+ 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.
+*/
+#ifndef
[Cmake-commits] CMake branch, next, updated. v2.8.11-2495-g3009e8e
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 3009e8eafa80c3eaca2e764dae17857dc5974362 (commit)
via cfa09dd43b1b068358f8c08cb82f12cfc325 (commit)
from c744a0bddf343d9ff63543bdce6b436930cf1369 (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=3009e8eafa80c3eaca2e764dae17857dc5974362
commit 3009e8eafa80c3eaca2e764dae17857dc5974362
Merge: c744a0b cfa09dd
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:50:06 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:50:06 2013 -0400
Merge topic 'test-genex-HEAD-target' into next
cfa09dd Revert Revert 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) /
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfa09dd43b1b068358f8c08cb82f12cfc325
commit cfa09dd43b1b068358f8c08cb82f12cfc325
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 11:49:22 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:49:22 2013 +0200
Revert Revert Genex: Fix the HEAD target used for evaluated expressions.
This reverts commit ffe0d3404eaed4aae12d6cda240e80b49e3ecd1b.
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(
context-Config,
-context-HeadTarget);
+
[Cmake-commits] CMake branch, next, updated. v2.8.11-2493-gc744a0b
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 c744a0bddf343d9ff63543bdce6b436930cf1369 (commit)
via ffe0d3404eaed4aae12d6cda240e80b49e3ecd1b (commit)
from 4798588d2f62f60cc2b34f2d45a1f34de80779be (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=c744a0bddf343d9ff63543bdce6b436930cf1369
commit c744a0bddf343d9ff63543bdce6b436930cf1369
Merge: 4798588 ffe0d34
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:47:20 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:47:20 2013 -0400
Merge topic 'test-genex-HEAD-target' into next
ffe0d34 Revert Genex: Fix the HEAD target used for evaluated expressions.
diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index 28f749d,de6371a..5e7d00d
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -724,14 -537,7 +723,12 @@@ 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) /
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffe0d3404eaed4aae12d6cda240e80b49e3ecd1b
commit ffe0d3404eaed4aae12d6cda240e80b49e3ecd1b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 11:46:45 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:46:45 2013 +0200
Revert Genex: Fix the HEAD target used for evaluated expressions.
This reverts commit d1d4dac774c333141ac4a7203d8b243e18530669.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index a01a0f8..de6371a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -315,7 +315,6 @@ static const char* targetPropertyTransitiveWhitelist[] = {
std::string getLinkedTargetsContent(const std::vectorstd::string libraries,
cmTarget *target,
- cmTarget *headTarget,
cmGeneratorExpressionContext *context,
cmGeneratorExpressionDAGChecker *dagChecker,
const std::string interfacePropertyName)
@@ -346,7 +345,7 @@ std::string getLinkedTargetsContent(const
std::vectorstd::string libraries,
std::string linkedTargetsContent = cge-Evaluate(context-Makefile,
context-Config,
context-Quiet,
- headTarget,
+ context-HeadTarget,
target,
dagChecker);
if (cge-GetHadContextSensitiveCondition())
@@ -539,8 +538,6 @@ 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) /
@@ -550,12 +547,11 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
const cmTarget::LinkInterface *iface = target-GetLinkInterface(
context-Config,
-headTarget);
+context-HeadTarget);
if(iface)
{
linkedTargetsContent =
getLinkedTargetsContent(iface-Libraries, target,
- headTarget,
context, dagChecker,
interfacePropertyName);
}
@@ -565,12 +561,11 @@ static const struct TargetPropertyNode : public
cmGeneratorExpressionNode
{
const cmTarget::LinkImplementation *impl = target-GetLinkImplementation(
context-Config,
-headTarget);
+
[Cmake-commits] CMake branch, next, updated. v2.8.11-2499-ge784e79
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 e784e79cd32755d240d3f56cf9d5fa150e7776b6 (commit)
via 1127149d82e86e2267b0d06bde34e5cbec8c (commit)
from 7e3945bcdd2c1776aa63ab86bd33832e45ddbd29 (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=e784e79cd32755d240d3f56cf9d5fa150e7776b6
commit e784e79cd32755d240d3f56cf9d5fa150e7776b6
Merge: 7e3945b 1127149
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:51:43 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:51:43 2013 -0400
Merge topic 'test-genex-HEAD-target' into next
1127149 Test that evaluating target properties does not result in errors.
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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1127149d82e86e2267b0d06bde34e5cbec8c
commit 1127149d82e86e2267b0d06bde34e5cbec8c
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 10:52:56 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:45:52 2013 +0200
Test that evaluating target properties does not result in errors.
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index ad6671f..bcfbe3c 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -109,6 +109,11 @@ set_property(TARGET libbad APPEND PROPERTY
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\)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp #include \common.h\\n)
add_library(lib5 ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp)
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
new file mode 100644
index 000..f388ef8
--- /dev/null
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
@@ -0,0 +1,4 @@
+
+int main() {
+ return 0;
+}
---
Summary of changes:
.../TargetIncludeDirectories/CMakeLists.txt|5 +
.../TargetIncludeDirectories/other.cpp}|5 ++---
2 files changed, 7 insertions(+), 3 deletions(-)
copy Tests/{TarTest/TestTarExec.cxx =
IncludeDirectories/TargetIncludeDirectories/other.cpp} (53%)
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-2497-g7e3945b
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 7e3945bcdd2c1776aa63ab86bd33832e45ddbd29 (commit)
via b1de7d1bd32fcb71e4005719fef85c8f33a70ff4 (commit)
from 3009e8eafa80c3eaca2e764dae17857dc5974362 (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=7e3945bcdd2c1776aa63ab86bd33832e45ddbd29
commit 7e3945bcdd2c1776aa63ab86bd33832e45ddbd29
Merge: 3009e8e b1de7d1
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 05:51:01 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 05:51:01 2013 -0400
Merge topic 'test-genex-HEAD-target' into next
b1de7d1 Revert Test that evaluating target properties does not result in
errors.
diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 66df404,ad6671f..088725b
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,33 -109,7 +109,26 @@@ 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
$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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1de7d1bd32fcb71e4005719fef85c8f33a70ff4
commit b1de7d1bd32fcb71e4005719fef85c8f33a70ff4
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 11:50:40 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 11:50:40 2013 +0200
Revert Test that evaluating target properties does not result in errors.
This reverts commit 945839f323a1f034969950e353c44b6fa62414e1.
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index ec9a8cf..ad6671f 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -109,13 +109,6 @@ set_property(TARGET libbad APPEND PROPERTY
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 $TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES
-$TARGET_PROPERTY:lib7,INTERFACE_INCLUDE_DIRECTORIES
-)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp #include \common.h\\n)
add_library(lib5 ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp)
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
deleted file mode 100644
index f388ef8..000
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-int main() {
- return 0;
-}
---
Summary of changes:
.../TargetIncludeDirectories/CMakeLists.txt|7 ---
.../TargetIncludeDirectories/other.cpp |4
2 files changed, 0 insertions(+), 11 deletions(-)
delete mode 100644 Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
[Cmake-commits] CMake branch, next, updated. v2.8.11-2502-gba5789d
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 ba5789d8de124378c21a5dccea34953fb65b0dc3 (commit) via 9efe35906af4447533d9e594df539e71293437dd (commit) via db15713f057ad4896eab07f847870f5ab42f8be1 (commit) from e784e79cd32755d240d3f56cf9d5fa150e7776b6 (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=ba5789d8de124378c21a5dccea34953fb65b0dc3 commit ba5789d8de124378c21a5dccea34953fb65b0dc3 Merge: e784e79 9efe359 Author: Stephen Kelly steve...@gmail.com AuthorDate: Tue Jun 4 06:01:55 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 4 06:01:55 2013 -0400 Merge topic 'cleanups' into next 9efe359 Add some spaces to the INCLUDE_DIRECTORIES documentation. db15713 Remove unused cmAddDefinitionsCommand::ParseDefinition method. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9efe35906af4447533d9e594df539e71293437dd commit 9efe35906af4447533d9e594df539e71293437dd Author: Stephen Kelly steve...@gmail.com AuthorDate: Tue Jun 4 11:30:23 2013 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Tue Jun 4 12:00:41 2013 +0200 Add some spaces to the INCLUDE_DIRECTORIES documentation. diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 606ec93..e57ff88 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3986,20 +3986,20 @@ void cmMakefile::DefineProperties(cmake *cm) (INCLUDE_DIRECTORIES, cmProperty::DIRECTORY, List of preprocessor include file search directories., This property specifies the list of directories given - so far to the include_directories command. - This property exists on directories and targets. + so far to the include_directories command. + This property exists on directories and targets. In addition to accepting values from the include_directories command, values may be set directly on any directory or any - target using the set_property command. + target using the set_property command. A target gets its initial value for this property from the value - of the directory property. + of the directory property. A directory gets its initial value from its parent directory if - it has one. + it has one. Both directory and target property values are adjusted by calls to the include_directories command. \n The target property values are used by the generators to set - the include paths for the compiler. + the include paths for the compiler. See also the include_directories command.); cm-DefineProperty http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db15713f057ad4896eab07f847870f5ab42f8be1 commit db15713f057ad4896eab07f847870f5ab42f8be1 Author: Stephen Kelly steve...@gmail.com AuthorDate: Tue Jun 4 02:50:10 2013 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Tue Jun 4 12:00:32 2013 +0200 Remove unused cmAddDefinitionsCommand::ParseDefinition method. diff --git a/Source/cmAddDefinitionsCommand.h b/Source/cmAddDefinitionsCommand.h index 6705d11..ff2c4a0 100644 --- a/Source/cmAddDefinitionsCommand.h +++ b/Source/cmAddDefinitionsCommand.h @@ -73,8 +73,6 @@ public: } cmTypeMacro(cmAddDefinitionsCommand, cmCommand); -private: - bool ParseDefinition(std::string const def); }; --- 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, next, updated. v2.8.11-2504-ga0767f4
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 a0767f43b9697750e4a3056e26f23b99d5924f0f (commit)
via 521c3e8764445ec72cb90076d196a2eb5f4e674f (commit)
from ba5789d8de124378c21a5dccea34953fb65b0dc3 (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=a0767f43b9697750e4a3056e26f23b99d5924f0f
commit a0767f43b9697750e4a3056e26f23b99d5924f0f
Merge: ba5789d 521c3e8
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 06:38:43 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 06:38:43 2013 -0400
Merge topic 'suppress-unused-cli-with-value-in-cache' into next
521c3e8 Only run the CliUnused test with the Makefiles generator.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=521c3e8764445ec72cb90076d196a2eb5f4e674f
commit 521c3e8764445ec72cb90076d196a2eb5f4e674f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 12:37:57 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 12:37:57 2013 +0200
Only run the CliUnused test with the Makefiles generator.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b005dca..a91eac7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1618,9 +1618,12 @@ ${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)
- if (NOT CMAKE_TEST_GENERATOR MATCHES Ninja)
+ if(${CMAKE_TEST_GENERATOR} MATCHES Makefile)
# Ninja does not support ADDITIONAL_MAKE_CLEAN_FILES and therefore fails
# this test. (See #13371)
+# Apparently Visual Studio does not support it either. As the MakeClean
+# test above is only run with the Makefiles generator, only run this
+# test with the Makefiles generator also.
add_test(WarnUnusedCliUnused ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/WarnUnusedCliUnused
---
Summary of changes:
Tests/CMakeLists.txt |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, next, updated. v2.8.11-2506-gf40bc69
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 f40bc69cd8628d51a0bf3a4138bc337cbab10207 (commit)
via 273ecab96d47d6ddba129be6200bc93ba7910b8c (commit)
from a0767f43b9697750e4a3056e26f23b99d5924f0f (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=f40bc69cd8628d51a0bf3a4138bc337cbab10207
commit f40bc69cd8628d51a0bf3a4138bc337cbab10207
Merge: a0767f4 273ecab
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jun 4 06:39:11 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 06:39:11 2013 -0400
Merge topic 'suppress-unused-cli-with-value-in-cache' into next
273ecab CLI: Suppress the unused warning if the key value pair is cached.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=273ecab96d47d6ddba129be6200bc93ba7910b8c
commit 273ecab96d47d6ddba129be6200bc93ba7910b8c
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu May 16 21:51:45 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Jun 4 12:38:56 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::vectorstd::string
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..a91eac7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1618,17 +1618,23 @@ ${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(${CMAKE_TEST_GENERATOR} MATCHES Makefile)
+# Ninja does not support ADDITIONAL_MAKE_CLEAN_FILES and therefore fails
+# this test. (See #13371)
+#
[Cmake-commits] CMake branch, master, updated. v2.8.11-276-g05e47f2
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 05e47f21222f0c14735ce1431a74a5ad974cb1a2 (commit) via 483e208482ff46532e7ae48659e569580a88af9c (commit) from b418327d1b85944d137913faf6c04537b5894e2f (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=05e47f21222f0c14735ce1431a74a5ad974cb1a2 commit 05e47f21222f0c14735ce1431a74a5ad974cb1a2 Merge: b418327 483e208 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 4 09:02:46 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 4 09:02:46 2013 -0400 Merge topic 'cfbundle-location' 483e208 OS X: Fix getting of CFBundle LOCATION property. --- Summary of changes: Source/cmExportInstallFileGenerator.cxx | 16 +--- Source/cmGlobalXCodeGenerator.cxx |8 +--- Source/cmMakefileLibraryTargetGenerator.cxx |2 -- Source/cmNinjaNormalTargetGenerator.cxx |2 -- Source/cmOSXBundleGenerator.cxx | 23 +-- Source/cmOSXBundleGenerator.h |8 +++- Source/cmTarget.cxx | 19 +-- Tests/CFBundleTest/CMakeLists.txt |2 ++ 8 files changed, 29 insertions(+), 51 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-285-gd3971ee
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 d3971ee603d5de51e7a15c816be137324d860124 (commit)
via 647745b3eedd0036d9e745007acd1d9cc460ccab (commit)
via 515f9af0d48be569adb51dfb43ff483cfc0d5156 (commit)
via c63d30048bcf5bd6efa1e038b36c5efd29e34749 (commit)
via 3d5bb381be16f67e4781c395bda2be12a5d00168 (commit)
from 1e15db366218170bca663c06f0246782c2642bdb (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=d3971ee603d5de51e7a15c816be137324d860124
commit d3971ee603d5de51e7a15c816be137324d860124
Merge: 1e15db3 647745b
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:03:00 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 09:03:00 2013 -0400
Merge topic 'fix-variable_watch-cases'
647745b variable_watch: Print accesses as CMake Debug Log messages
515f9af variable_watch: Remove leftover debugging code (#14187)
c63d300 variable_watch: Add test for MODIFIED_ACCESS report
3d5bb38 variable_watch: Add missing string enumeration entry (#14188)
---
Summary of changes:
Source/cmVariableWatch.cxx |1 +
Source/cmVariableWatchCommand.cxx | 21 ++-
Tests/RunCMake/CMakeLists.txt |1 +
.../{CMP0004 = variable_watch}/CMakeLists.txt |0
.../variable_watch/ModifiedAccess-stderr.txt |4 +++
Tests/RunCMake/variable_watch/ModifiedAccess.cmake |3 ++
Tests/RunCMake/variable_watch/NoWatcher-stderr.txt |5
Tests/RunCMake/variable_watch/NoWatcher.cmake |8 +++
Tests/RunCMake/variable_watch/RunCMakeTest.cmake |4 +++
9 files changed, 29 insertions(+), 18 deletions(-)
copy Tests/RunCMake/{CMP0004 = variable_watch}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt
create mode 100644 Tests/RunCMake/variable_watch/ModifiedAccess.cmake
create mode 100644 Tests/RunCMake/variable_watch/NoWatcher-stderr.txt
create mode 100644 Tests/RunCMake/variable_watch/NoWatcher.cmake
create mode 100644 Tests/RunCMake/variable_watch/RunCMakeTest.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, next, updated. v2.8.11-2513-g3b4c9ef
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 3b4c9efb6ef3ca351c2490d2cab224d6977b596d (commit) via d3971ee603d5de51e7a15c816be137324d860124 (commit) via 1e15db366218170bca663c06f0246782c2642bdb (commit) via 05e47f21222f0c14735ce1431a74a5ad974cb1a2 (commit) via b418327d1b85944d137913faf6c04537b5894e2f (commit) from e5098c8bc8c50527c64c084154fbeff1e96c7a2f (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=3b4c9efb6ef3ca351c2490d2cab224d6977b596d commit 3b4c9efb6ef3ca351c2490d2cab224d6977b596d Merge: e5098c8 d3971ee Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 4 09:01:37 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Jun 4 09:01:37 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, next, updated. v2.8.11-2518-g5354df7
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 5354df72e26ce7e8180d9b6a17b2374689c67790 (commit)
via d26800bc40a103d90366da176ad68ed92f21daab (commit)
from d8586e0c4f22c3c3a02a8761b171b76f82de0e59 (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=5354df72e26ce7e8180d9b6a17b2374689c67790
commit 5354df72e26ce7e8180d9b6a17b2374689c67790
Merge: d8586e0 d26800b
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:16:37 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 09:16:37 2013 -0400
Merge topic 'fix-path-root-dot-dot' into next
d26800b get_filename_component: Test ABSOLUTE of .. after root component
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d26800bc40a103d90366da176ad68ed92f21daab
commit d26800bc40a103d90366da176ad68ed92f21daab
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 11:17:20 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 09:09:22 2013 -0400
get_filename_component: Test ABSOLUTE of .. after root component
Teach the RunCMake.get_filename_component test to verify that .. does
not remove the root filename component.
diff --git a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
index a4ef8ff..9d7cf90 100644
--- a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
+++ b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
@@ -24,6 +24,11 @@ check(DIRECTORY in windows root ${test_winroot} c:/)
get_filename_component(test_absolute /path/to/a/../filename.ext.in ABSOLUTE)
check(ABSOLUTE ${test_absolute} /path/to/filename.ext.in)
+get_filename_component(test_absolute /../path/to/filename.ext.in ABSOLUTE)
+check(ABSOLUTE .. in root ${test_absolute} /path/to/filename.ext.in)
+get_filename_component(test_absolute c:/../path/to/filename.ext.in ABSOLUTE)
+check(ABSOLUTE .. in windows root ${test_absolute}
c:/path/to/filename.ext.in)
+
get_filename_component(test_cache /path/to/filename.ext.in DIRECTORY CACHE)
check(CACHE 1 ${test_cache} /path/to)
get_filename_component(test_cache /path/to/other/filename.ext.in DIRECTORY
CACHE)
---
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, next, updated. v2.8.11-2516-gd8586e0
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 d8586e0c4f22c3c3a02a8761b171b76f82de0e59 (commit)
via c91e88d0e15f38616284f12fc0f2152ac6c0562c (commit)
via 6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b (commit)
from 3b4c9efb6ef3ca351c2490d2cab224d6977b596d (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=d8586e0c4f22c3c3a02a8761b171b76f82de0e59
commit d8586e0c4f22c3c3a02a8761b171b76f82de0e59
Merge: 3b4c9ef c91e88d
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:16:28 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 09:16:28 2013 -0400
Merge topic 'update-kwsys' into next
c91e88d Merge branch 'upstream-kwsys' into update-kwsys
6dc3dd9 KWSys 2013-06-03 (d79a792e)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c91e88d0e15f38616284f12fc0f2152ac6c0562c
commit c91e88d0e15f38616284f12fc0f2152ac6c0562c
Merge: 9d38db5 6dc3dd9
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:08:58 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 09:08:58 2013 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b
commit 6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Mon Jun 3 11:12:00 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 09:08:54 2013 -0400
KWSys 2013-06-03 (d79a792e)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ d79a792e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dccf7725..d79a792e
Brad King (1):
d79a792e SystemTools: Fix CollapseFullPath to not erase root component
Change-Id: I25c6600a621a960738b5afc0ba73f63df0693303
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 652649f..7891708 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -3085,7 +3085,7 @@ SystemToolsAppendComponents(
{
if(*i == ..)
{
- if(out_components.begin() != out_components.end())
+ if(out_components.size() 1)
{
out_components.erase(out_components.end()-1, out_components.end());
}
---
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, next, updated. v2.8.11-2520-g0a95eb9
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 0a95eb978f02a39fff8efa9074b45146d81a57b7 (commit)
via 21a0beacc1d8c452f13453b22f36c91fbbd0a182 (commit)
from 5354df72e26ce7e8180d9b6a17b2374689c67790 (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=0a95eb978f02a39fff8efa9074b45146d81a57b7
commit 0a95eb978f02a39fff8efa9074b45146d81a57b7
Merge: 5354df7 21a0bea
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 10:57:37 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 10:57:37 2013 -0400
Merge topic 'xcode-framework-paths' into next
21a0bea Xcode: Fix framework search paths in STATIC library targets (#14191)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21a0beacc1d8c452f13453b22f36c91fbbd0a182
commit 21a0beacc1d8c452f13453b22f36c91fbbd0a182
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:49:40 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 09:49:40 2013 -0400
Xcode: Fix framework search paths in STATIC library targets (#14191)
In commit 2bc22bda (Xcode: Add frameworks search paths from link
dependeny closure, 2012-12-07) we made framework search paths from the
link closure conditional on target type, skipping it on STATIC and
OBJECT library targets that do not actually link. However, the
framework search paths also influence the compile lines (-F options) so
we need them for all target types. The Makefile generator already does
this, as did the Xcode generator prior to the above-mentioned commit.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index b2d325c..0f59c02 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1997,20 +1997,16 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget target,
dirs.Add(incpath.c_str());
}
}
- if(target.GetType() != cmTarget::OBJECT_LIBRARY
- target.GetType() != cmTarget::STATIC_LIBRARY)
+ // Add framework search paths needed for linking.
+ if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName))
{
-// Add framework search paths needed for linking.
-if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName))
+std::vectorstd::string const fwDirs = cli-GetFrameworkPaths();
+for(std::vectorstd::string::const_iterator fdi = fwDirs.begin();
+fdi != fwDirs.end(); ++fdi)
{
- std::vectorstd::string const fwDirs = cli-GetFrameworkPaths();
- for(std::vectorstd::string::const_iterator fdi = fwDirs.begin();
- fdi != fwDirs.end(); ++fdi)
+ if(emitted.insert(*fdi).second)
{
-if(emitted.insert(*fdi).second)
- {
- fdirs.Add(this-XCodeEscapePath(fdi-c_str()).c_str());
- }
+fdirs.Add(this-XCodeEscapePath(fdi-c_str()).c_str());
}
}
}
---
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-2522-g6aa8810
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 6aa8810ffdff230ad09b5cba61fe746dad090b4d (commit)
via 9fa668ce0b3ffd29aaae9719b00c2220dd6bd8ab (commit)
from 0a95eb978f02a39fff8efa9074b45146d81a57b7 (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=6aa8810ffdff230ad09b5cba61fe746dad090b4d
commit 6aa8810ffdff230ad09b5cba61fe746dad090b4d
Merge: 0a95eb9 9fa668c
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 14:55:15 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 14:55:15 2013 -0400
Merge topic 'ninja_phony_file_targets' into next
9fa668c Revert topic 'ninja_phony_file_targets'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fa668ce0b3ffd29aaae9719b00c2220dd6bd8ab
commit 9fa668ce0b3ffd29aaae9719b00c2220dd6bd8ab
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 14:52:35 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 14:52:35 2013 -0400
Revert topic 'ninja_phony_file_targets'
This will be replaced by a new implementation in another topic.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 29045a9..fa277b1 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -250,6 +250,7 @@ cmGlobalNinjaGenerator::WriteCustomCommandBuild(const
std::string command,
cmNinjaVars vars;
vars[COMMAND] = cmd;
vars[DESC] = EncodeLiteral(description);
+
cmGlobalNinjaGenerator::WriteBuild(*this-BuildFileStream,
comment,
CUSTOM_COMMAND,
@@ -258,14 +259,6 @@ cmGlobalNinjaGenerator::WriteCustomCommandBuild(const
std::string command,
cmNinjaDeps(),
orderOnlyDeps,
vars);
-
-//we need to track every dependency that comes in, since we are trying
-//to find dependencies that are side effects of other custom commands
-//
-for(cmNinjaDeps::const_iterator i=deps.begin(); i != deps.end(); ++i)
- {
- this-UnknownCustomCommandFileDependencies.insert(*i);
- }
}
void
@@ -485,7 +478,6 @@ void cmGlobalNinjaGenerator::Generate()
this-WriteAssumedSourceDependencies();
this-WriteTargetAliases(*this-BuildFileStream);
- this-WriteUnknownCustomDependencies(*this-BuildFileStream);
this-WriteBuiltinTargets(*this-BuildFileStream);
if (cmSystemTools::GetErrorOccuredFlag()) {
@@ -893,7 +885,7 @@ void
cmGlobalNinjaGenerator::WriteTargetAliases(std::ostream os)
cmGlobalNinjaGenerator::WriteDivider(os);
os # Target aliases.\n\n;
- for (TargetAliasMap::const_iterator i = TargetAliases.begin();
+ for (TargetAliasMap::iterator i = TargetAliases.begin();
i != TargetAliases.end(); ++i) {
// Don't write ambiguous aliases.
if (!i-second)
@@ -909,64 +901,6 @@ void
cmGlobalNinjaGenerator::WriteTargetAliases(std::ostream os)
}
}
-void cmGlobalNinjaGenerator::WriteUnknownCustomDependencies(std::ostream os)
-{
- //now write out the unknown dependencies. Don't write out any
- //of these that are now have been added as a known output, file
- //dependency or alias
- cmGlobalNinjaGenerator::WriteDivider(os);
- os # Unknown Build Time Dependencies.
- # Tell Ninja that they may appear as side effects of build rules
- # otherwise ordered by order-only dependencies.\n\n;
-
- std::string const rootBuildDirectory =
- this-GetCMakeInstance()-GetHomeOutputDirectory();
-
- //remove the following possible targets that we know
- //are false positives
- UnknownCustomCommandFileDependencies.erase(all);
-
- //get the list of files that cmake itself has generated as a
- //product of configuration.
- std::setstd::string configuredFiles;
- for (std::vectorcmLocalGenerator *::const_iterator i =
- this-LocalGenerators.begin(); i != this-LocalGenerators.end(); ++i)
-{
-const std::vectorstd::string of = (*i)-GetMakefile()-GetOutputFiles();
-configuredFiles.insert(of.begin(), of.end());
-}
-
- typedef std::setstd::string::const_iterator uccfd_iterator;
- for (uccfd_iterator i = UnknownCustomCommandFileDependencies.begin();
- i != UnknownCustomCommandFileDependencies.end(); ++i)
-{
-bool isUnknown = ( this-CustomCommandOutputs.find(*i) ==
- this-CustomCommandOutputs.end() );
-isUnknown = isUnknown configuredFiles.count(*i) == 0;
-isUnknown = isUnknown this-TargetAliases.count(*i) == 0;
-
-if(!isUnknown)
-{
- continue;
-
[Cmake-commits] CMake branch, master, updated. v2.8.11-286-g4d15c0b
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 4d15c0b7c6f11c7486da7e760c59a1e7daabacab (commit) from d3971ee603d5de51e7a15c816be137324d860124 (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=4d15c0b7c6f11c7486da7e760c59a1e7daabacab commit 4d15c0b7c6f11c7486da7e760c59a1e7daabacab Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed Jun 5 00:01:08 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed Jun 5 00:01:08 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e53fb54..d5e0330 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 20130604) +set(CMake_VERSION_TWEAK 20130605) #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
