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 3989553aae0bf67901dd141d7ebc86fa97dfe027 (commit)
via 4608bdd26bff0cb359691d7acf7af11e5f1fb335 (commit)
from 752fcaede3b811298a07b3326d22bd9bf1f77631 (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=3989553aae0bf67901dd141d7ebc86fa97dfe027
commit 3989553aae0bf67901dd141d7ebc86fa97dfe027
Merge: 752fcae 4608bdd
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Sep 23 12:36:19 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 23 12:36:19 2014 -0400
Merge topic 'autorcc-depends' into next
4608bdd2 Use BOOL genex.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4608bdd26bff0cb359691d7acf7af11e5f1fb335
commit 4608bdd26bff0cb359691d7acf7af11e5f1fb335
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Sep 23 18:36:10 2014 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Sep 23 18:36:10 2014 +0200
Use BOOL genex.
diff --git a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
b/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
index d84f2a0..5013739 100644
--- a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
+++ b/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
@@ -35,6 +35,6 @@ add_executable(test_res2
target_link_libraries(test_res2 ${QT_CORE_TARGET})
file(GENERATE
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/info_file$<$<CONFIG>>:_$<CONFIG>>.txt"
+ OUTPUT
"${CMAKE_CURRENT_BINARY_DIR}/info_file$<$<BOOL:$<CONFIG>>:_$<CONFIG>>.txt"
CONTENT "$<TARGET_FILE:test_res1>\n$<TARGET_FILE:test_res2>\n"
)
-----------------------------------------------------------------------
Summary of changes:
Tests/QtAutogen/autorcc_depends/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
