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 98539c551dee1b3240a683b282dbdefd574f7de2 (commit) via f603957178a5c216c56789f65c38efb79c7cb8b6 (commit) via 3ad7e08f2cc0134a21433845b18f8910397ece16 (commit) from e3241cb33227befa8670339098fc3c27056769c0 (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=98539c551dee1b3240a683b282dbdefd574f7de2 commit 98539c551dee1b3240a683b282dbdefd574f7de2 Merge: e3241cb f603957 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Thu Mar 27 18:24:05 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Mar 27 18:24:05 2014 -0400 Merge topic 'target-sources-refactor' into next f6039571 Update test message. 3ad7e08f cmSourceFileLocation: Normalize compared directories. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f603957178a5c216c56789f65c38efb79c7cb8b6 commit f603957178a5c216c56789f65c38efb79c7cb8b6 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Thu Mar 27 23:23:31 2014 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Thu Mar 27 23:23:31 2014 +0100 Update test message. diff --git a/Tests/RunCMake/TargetObjects/BadContext-stderr.txt b/Tests/RunCMake/TargetObjects/BadContext-stderr.txt index 4d28c8e..92f2c91 100644 --- a/Tests/RunCMake/TargetObjects/BadContext-stderr.txt +++ b/Tests/RunCMake/TargetObjects/BadContext-stderr.txt @@ -3,8 +3,8 @@ CMake Error at BadContext.cmake:2 \(file\): \$<TARGET_OBJECTS:NoTarget> - The TARGET_OBJECTS generator expression may only be evaluated by cmake - itself. It may not be evaluated by file\(GENERATE\), install\(FILES\) etc. + The evaluation of the TARGET_OBJECTS generator expression is only suitable + for consumption by CMake. It is not suitable for writing out elsewhere. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) + @@ -13,5 +13,5 @@ CMake Error: \$<TARGET_OBJECTS:NoTarget> - The TARGET_OBJECTS generator expression may only be evaluated by cmake - itself. It may not be evaluated by file\(GENERATE\), install\(FILES\) etc. + The evaluation of the TARGET_OBJECTS generator expression is only suitable + for consumption by CMake. It is not suitable for writing out elsewhere. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ad7e08f2cc0134a21433845b18f8910397ece16 commit 3ad7e08f2cc0134a21433845b18f8910397ece16 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Thu Mar 20 21:09:33 2014 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Thu Mar 27 23:21:32 2014 +0100 cmSourceFileLocation: Normalize compared directories. Otherwise Matches() ends up doing a comparison of the directories /path/to/dir/subdir/.. and /path/to/dir as strings and not matching where it should. diff --git a/Tests/Properties/CMakeLists.txt b/Tests/Properties/CMakeLists.txt index 285d596..11fca45 100644 --- a/Tests/Properties/CMakeLists.txt +++ b/Tests/Properties/CMakeLists.txt @@ -143,3 +143,5 @@ set_property(CACHE SOME_ENTRY PROPERTY VALUE "${expect_VALUE}") set_property(CACHE SOME_ENTRY PROPERTY ADVANCED "${expect_ADVANCED}") set_property(CACHE SOME_ENTRY PROPERTY STRINGS "${expect_STRINGS}") check_cache_props() + +add_subdirectory(SubDir2) diff --git a/Tests/Properties/SubDir2/CMakeLists.txt b/Tests/Properties/SubDir2/CMakeLists.txt new file mode 100644 index 0000000..377dc83 --- /dev/null +++ b/Tests/Properties/SubDir2/CMakeLists.txt @@ -0,0 +1,5 @@ + +set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/../subdirtest.cxx" + PROPERTIES COMPILE_DEFINITIONS SUBDIR_TEST) + +add_executable(subdirtest "${CMAKE_CURRENT_SOURCE_DIR}/../subdirtest.cxx") diff --git a/Tests/Properties/subdirtest.cxx b/Tests/Properties/subdirtest.cxx new file mode 100644 index 0000000..02d8f3d --- /dev/null +++ b/Tests/Properties/subdirtest.cxx @@ -0,0 +1,9 @@ + +#ifndef SUBDIR_TEST +#error Expected SUBDIR_TEST +#endif + +int main(int, char**) +{ + return 0; +} ----------------------------------------------------------------------- Summary of changes: Tests/RunCMake/TargetObjects/BadContext-stderr.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits