[Cmake-commits] CMake branch, next, updated. v3.3.1-2867-g1248582
Stephen Kelly
steveire at gmail.com
Fri Sep 11 13:14:16 EDT 2015
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 1248582c79708e3e63a495582cbf548cdcd86b6c (commit)
via ed258d606b87dacc465dad73b04f1c3e270b627c (commit)
via fb45c37160e4f8d839a2c29bce80cae7563cfd3a (commit)
via 158f7e31dc685859f5a53d88e965382c6361efb1 (commit)
via 08ce3f486e789275104a390d2d34f36a90c5fd2f (commit)
from dcb2768be80e93b202f0d6a9751211686a63cc22 (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=1248582c79708e3e63a495582cbf548cdcd86b6c
commit 1248582c79708e3e63a495582cbf548cdcd86b6c
Merge: dcb2768 ed258d6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 11 13:14:15 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 11 13:14:15 2015 -0400
Merge topic 'fix-buildsystem-property-append' into next
ed258d60 Tests: Cover set_property for buildsystem directory properties
fb45c371 cmState: Only append non-empty values to buildsystem properties.
158f7e31 cmMakefile: Use appropriate parameter name.
08ce3f48 cmTarget: Only append non-empty values to buildsystem properties.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed258d606b87dacc465dad73b04f1c3e270b627c
commit ed258d606b87dacc465dad73b04f1c3e270b627c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 16:38:19 2015 -0400
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 11 19:13:25 2015 +0200
Tests: Cover set_property for buildsystem directory properties
Extend the RunCMake.set_property test with cases covering buildsystem
directory properties:
* COMPILE_DEFINITIONS
* COMPILE_OPTIONS
* INCLUDE_DIRECTORIES
Also test a non-buildsystem property to document the equivalence
in behavior.
diff --git a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
index 186fe99..dd5bae1 100644
--- a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
+++ b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
@@ -1 +1,2 @@
-- Target COMPILE_DEFINITIONS is 'a;b;c;d;;e'
+-- Directory COMPILE_DEFINITIONS is 'a;b;c;d;;e'
diff --git a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake
index ec07ce9..f0c63bf 100644
--- a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake
+++ b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake
@@ -1,2 +1,3 @@
include(Common.cmake)
test_target_property(COMPILE_DEFINITIONS)
+test_directory_property(COMPILE_DEFINITIONS)
diff --git a/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt b/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
index 65d6934..1a20501 100644
--- a/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
+++ b/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
@@ -1 +1,2 @@
-- Target COMPILE_OPTIONS is 'a;b;c;d;;e'
+-- Directory COMPILE_OPTIONS is 'a;b;c;d;;e'
diff --git a/Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake b/Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake
index da20ec8..75f0535 100644
--- a/Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake
+++ b/Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake
@@ -1,2 +1,3 @@
include(Common.cmake)
test_target_property(COMPILE_OPTIONS)
+test_directory_property(COMPILE_OPTIONS)
diff --git a/Tests/RunCMake/set_property/Common.cmake b/Tests/RunCMake/set_property/Common.cmake
index b359487..9d5e4f4 100644
--- a/Tests/RunCMake/set_property/Common.cmake
+++ b/Tests/RunCMake/set_property/Common.cmake
@@ -12,3 +12,17 @@ macro(test_target_property PROP)
message(STATUS "Target ${PROP} is '${val}'")
set_property(TARGET CustomTarget PROPERTY ${PROP})
endmacro()
+
+macro(test_directory_property PROP)
+ set_property(DIRECTORY PROPERTY ${PROP} x)
+ set_property(DIRECTORY PROPERTY ${PROP})
+ set_property(DIRECTORY APPEND PROPERTY ${PROP})
+ set_property(DIRECTORY PROPERTY ${PROP} a)
+ set_property(DIRECTORY APPEND PROPERTY ${PROP} "")
+ set_property(DIRECTORY APPEND PROPERTY ${PROP} b c)
+ set_property(DIRECTORY APPEND PROPERTY ${PROP})
+ set_property(DIRECTORY APPEND PROPERTY ${PROP} "d;;e")
+ get_property(val DIRECTORY PROPERTY ${PROP})
+ message(STATUS "Directory ${PROP} is '${val}'")
+ set_property(DIRECTORY PROPERTY ${PROP})
+endmacro()
diff --git a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
index 955bdf2..c957dd5 100644
--- a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
+++ b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
@@ -1 +1,2 @@
-- Target INCLUDE_DIRECTORIES is 'a;b;c;d;;e'
+-- Directory INCLUDE_DIRECTORIES is 'a;b;c;d;;e'
diff --git a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake
index 8f44aee..c9a9151 100644
--- a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake
+++ b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake
@@ -1,2 +1,3 @@
include(Common.cmake)
test_target_property(INCLUDE_DIRECTORIES)
+test_directory_property(INCLUDE_DIRECTORIES)
diff --git a/Tests/RunCMake/set_property/USER_PROP-stdout.txt b/Tests/RunCMake/set_property/USER_PROP-stdout.txt
index eaf6e37..107cc87 100644
--- a/Tests/RunCMake/set_property/USER_PROP-stdout.txt
+++ b/Tests/RunCMake/set_property/USER_PROP-stdout.txt
@@ -1 +1,2 @@
-- Target USER_PROP is 'a;b;c;d;;e'
+-- Directory USER_PROP is 'a;b;c;d;;e'
diff --git a/Tests/RunCMake/set_property/USER_PROP.cmake b/Tests/RunCMake/set_property/USER_PROP.cmake
index e1f88e1..aa0aa83 100644
--- a/Tests/RunCMake/set_property/USER_PROP.cmake
+++ b/Tests/RunCMake/set_property/USER_PROP.cmake
@@ -1,2 +1,3 @@
include(Common.cmake)
test_target_property(USER_PROP)
+test_directory_property(USER_PROP)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb45c37160e4f8d839a2c29bce80cae7563cfd3a
commit fb45c37160e4f8d839a2c29bce80cae7563cfd3a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 10 23:00:27 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 11 19:12:46 2015 +0200
cmState: Only append non-empty values to buildsystem properties.
This is a change in behavior from CMake 3.3, but there is no semantic meaning
to empty entries in buildsystem properties. This also restores behavior to
that of CMake 2.8.10.
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index b66f403..f8971ad 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1378,6 +1378,11 @@ template <typename T, typename U, typename V>
void AppendEntry(T& content, U& backtraces, V& endContentPosition,
const std::string& value, const cmListFileBacktrace& lfbt)
{
+ if (value.empty())
+ {
+ return;
+ }
+
assert(endContentPosition == content.size());
content.push_back(value);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=158f7e31dc685859f5a53d88e965382c6361efb1
commit 158f7e31dc685859f5a53d88e965382c6361efb1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 10 22:59:40 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 11 18:30:47 2015 +0200
cmMakefile: Use appropriate parameter name.
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index b30c10b..b66f403 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1376,11 +1376,11 @@ cmBacktraceRange GetPropertyBacktraces(T const& content,
template <typename T, typename U, typename V>
void AppendEntry(T& content, U& backtraces, V& endContentPosition,
- const std::string& vec, const cmListFileBacktrace& lfbt)
+ const std::string& value, const cmListFileBacktrace& lfbt)
{
assert(endContentPosition == content.size());
- content.push_back(vec);
+ content.push_back(value);
backtraces.push_back(lfbt);
endContentPosition = content.size();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08ce3f486e789275104a390d2d34f36a90c5fd2f
commit 08ce3f486e789275104a390d2d34f36a90c5fd2f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 10 22:58:04 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 11 18:30:46 2015 +0200
cmTarget: Only append non-empty values to buildsystem properties.
This is a change in behavior from CMake 3.3, but there is no semantic meaning
to empty entries in buildsystem properties. This also restores behavior to
that of CMake 2.8.10.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3425f34..2dfa19c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1706,7 +1706,7 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
}
else if(prop == "INCLUDE_DIRECTORIES")
{
- if (value)
+ if (value && *value)
{
this->Internal->IncludeDirectoriesEntries.push_back(value);
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
@@ -1715,7 +1715,7 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
}
else if(prop == "COMPILE_OPTIONS")
{
- if (value)
+ if (value && *value)
{
this->Internal->CompileOptionsEntries.push_back(value);
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
@@ -1724,7 +1724,7 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
}
else if(prop == "COMPILE_FEATURES")
{
- if (value)
+ if (value && *value)
{
this->Internal->CompileFeaturesEntries.push_back(value);
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
@@ -1733,7 +1733,7 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
}
else if(prop == "COMPILE_DEFINITIONS")
{
- if (value)
+ if (value && *value)
{
this->Internal->CompileDefinitionsEntries.push_back(value);
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
@@ -1749,7 +1749,7 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
}
else if (prop == "LINK_LIBRARIES")
{
- if (value)
+ if (value && *value)
{
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
cmValueWithOrigin entry(value, lfbt);
diff --git a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
index b85f41d..186fe99 100644
--- a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
+++ b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
@@ -1 +1 @@
--- Target COMPILE_DEFINITIONS is 'a;;b;c;;d;;e'
+-- Target COMPILE_DEFINITIONS is 'a;b;c;d;;e'
diff --git a/Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt b/Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt
index 81ef170..bd5a992 100644
--- a/Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt
+++ b/Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt
@@ -1 +1 @@
--- Target COMPILE_FEATURES is 'a;;b;c;;d;;e'
+-- Target COMPILE_FEATURES is 'a;b;c;d;;e'
diff --git a/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt b/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
index f18451a..65d6934 100644
--- a/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
+++ b/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
@@ -1 +1 @@
--- Target COMPILE_OPTIONS is 'a;;b;c;;d;;e'
+-- Target COMPILE_OPTIONS is 'a;b;c;d;;e'
diff --git a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
index f9970ce..955bdf2 100644
--- a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
+++ b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
@@ -1 +1 @@
--- Target INCLUDE_DIRECTORIES is 'a;;b;c;;d;;e'
+-- Target INCLUDE_DIRECTORIES is 'a;b;c;d;;e'
diff --git a/Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt b/Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt
index 1f7663b..9a3988e 100644
--- a/Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt
+++ b/Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt
@@ -1 +1 @@
--- Target LINK_LIBRARIES is 'a;;b;c;;d;;e'
+-- Target LINK_LIBRARIES is 'a;b;c;d;;e'
-----------------------------------------------------------------------
Summary of changes:
Source/cmState.cxx | 9 +++++++--
Source/cmTarget.cxx | 10 +++++-----
.../RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt | 3 ++-
Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake | 1 +
Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt | 2 +-
Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt | 3 ++-
Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake | 1 +
Tests/RunCMake/set_property/Common.cmake | 14 ++++++++++++++
.../RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt | 3 ++-
Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake | 1 +
Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt | 2 +-
Tests/RunCMake/set_property/USER_PROP-stdout.txt | 1 +
Tests/RunCMake/set_property/USER_PROP.cmake | 1 +
13 files changed, 39 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list