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 a1859811ec00a1b0c3755c023e32cce83c0ffe0d (commit)
via 9fbd1712e3e0ee6291246bda58d34f8022b3fa81 (commit)
from 0bfa2a5fb0e4ab94d9c22fe3ccf71ba9d180d456 (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=a1859811ec00a1b0c3755c023e32cce83c0ffe0d
commit a1859811ec00a1b0c3755c023e32cce83c0ffe0d
Merge: 0bfa2a5 9fbd171
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 6 10:12:32 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Oct 6 10:12:32 2014 -0400
Merge topic 'autorcc-depends' into next
9fbd1712 Tests/QtAutogen: Fix selection of try_compile'd binary
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fbd1712e3e0ee6291246bda58d34f8022b3fa81
commit 9fbd1712e3e0ee6291246bda58d34f8022b3fa81
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 6 10:11:36 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Oct 6 10:11:36 2014 -0400
Tests/QtAutogen: Fix selection of try_compile'd binary
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 8adf87e..028649e 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -127,26 +127,7 @@ if (NOT CMAKE_GENERATOR STREQUAL Ninja)
message(SEND_ERROR "Initial build of autorcc_depends failed. Output:
${output}")
endif()
- set(info_file "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt")
- if (NOT EXISTS ${info_file})
- unset(info_file)
- foreach(_config ${CMAKE_BUILD_TYPE} ${CMAKE_CONFIGURATION_TYPES})
- set(_info_file
"${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file_${_config}.txt")
- if (EXISTS ${_info_file})
- set(info_file ${_info_file})
- break()
- else()
- message("Does not exist:
${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file_${_config}.txt")
- endif()
- endforeach()
- if (NOT info_file)
- file(GLOB info_files
"${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file*" )
- message("info_files glob: ${info_files}")
- message(SEND_ERROR "No valid info_file found!")
- endif()
- endif()
-
- file(STRINGS "${info_file}" qrc_files)
+ file(STRINGS "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt"
qrc_files)
list(GET qrc_files 0 qrc_file1)
diff --git a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
b/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
index 590271f..afd95bc 100644
--- a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
+++ b/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
@@ -20,8 +20,5 @@ add_executable(test_res1
res1.qrc
)
target_link_libraries(test_res1 ${QT_CORE_TARGET})
-
-file(GENERATE
- OUTPUT
"${CMAKE_CURRENT_BINARY_DIR}/info_file$<$<BOOL:$<CONFIG>>:_$<CONFIG>>.txt"
- CONTENT "$<TARGET_FILE:test_res1>\n"
-)
+add_custom_command(TARGET test_res1 POST_BUILD COMMAND
+ ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:test_res1>" > info_file.txt)
-----------------------------------------------------------------------
Summary of changes:
Tests/QtAutogen/CMakeLists.txt | 21 +--------------------
Tests/QtAutogen/autorcc_depends/CMakeLists.txt | 7 ++-----
2 files changed, 3 insertions(+), 25 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
