[Cmake-commits] CMake branch, next, updated. v3.0.2-5423-g2e5042a

[Stephen Kelly]

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  2e5042a2523a1747cbc86f5febef6b76c8a40b1b (commit)
       via  1361f8e554e858356ea249ffbf7234492eaaa415 (commit)
      from  cb0ecc95d7da20b651f9e14e24235499a161a4b0 (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=2e5042a2523a1747cbc86f5febef6b76c8a40b1b
commit 2e5042a2523a1747cbc86f5febef6b76c8a40b1b
Merge: cb0ecc9 1361f8e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 23 10:37:45 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 23 10:37:45 2014 -0400

    Merge topic 'autorcc-depends' into next
    
    1361f8e5 Create config-specific info_files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1361f8e554e858356ea249ffbf7234492eaaa415
commit 1361f8e554e858356ea249ffbf7234492eaaa415
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 23 16:37:23 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Sep 23 16:37:23 2014 +0200

    Create config-specific info_files.

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 6e13fae..ff58bf9 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -121,7 +121,23 @@ try_compile(RCC_DEPENDS
   CMAKE_FLAGS "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}" "-DQT_TEST_VERSION=${QT_TEST_VERSION}"
   OUTPUT_VARIABLE output
 )
-file(STRINGS "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt" qrc_files)
+
+set(info_file "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt")
+if (NOT EXISTS ${info_file})
+  unset(info_file)
+  foreach(_config ${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()
+    endif()
+  endforeach()
+  if (NOT info_file)
+    message(SEND_ERROR "No valid info_file found!")
+  endif()
+endif()
+
+file(STRINGS "${info_file}" qrc_files)
 
 list(GET qrc_files 0 qrc_file1)
 list(GET qrc_files 1 qrc_file2)
diff --git a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt b/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
index fbb480a..d84f2a0 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.txt"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/info_file$<$<CONFIG>>:_$<CONFIG>>.txt"
   CONTENT "$<TARGET_FILE:test_res1>\n$<TARGET_FILE:test_res2>\n"
 )

-----------------------------------------------------------------------

Summary of changes:
 Tests/QtAutogen/CMakeLists.txt                 |   18 +++++++++++++++++-
 Tests/QtAutogen/autorcc_depends/CMakeLists.txt |    2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake