[Cmake-commits] CMake branch, next, updated. v3.0.2-5458-g8abd55d

[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  8abd55d1ac14a8421ab113d0b00ebd98e502f6a1 (commit)
       via  dd7249b75e79a4e1086187788e06984c2a9f7841 (commit)
      from  4185fe94803811053da02d4b0a99ed9cecda3767 (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=8abd55d1ac14a8421ab113d0b00ebd98e502f6a1
commit 8abd55d1ac14a8421ab113d0b00ebd98e502f6a1
Merge: 4185fe9 dd7249b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 25 06:33:24 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 25 06:33:24 2014 -0400

    Merge topic 'autorcc-depends' into next
    
    dd7249b7 Don't test generated qrc files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd7249b75e79a4e1086187788e06984c2a9f7841
commit dd7249b75e79a4e1086187788e06984c2a9f7841
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 25 12:25:53 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 25 12:31:59 2014 +0200

    Don't test generated qrc files.

diff --git a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt b/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
index 5013739..590271f 100644
--- a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
+++ b/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
@@ -15,26 +15,13 @@ else()
   set(QT_CORE_TARGET Qt5::Core)
 endif()
 
-add_custom_command(OUTPUT generated.txt
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/res1_input.txt" "${CMAKE_CURRENT_BINARY_DIR}/generated.txt"
-  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/res1_input.txt"
-)
-
-configure_file(res1.qrc.in res1_gen.qrc)
-
 add_executable(test_res1
   test_res1.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/res1_gen.qrc
+  res1.qrc
 )
 target_link_libraries(test_res1 ${QT_CORE_TARGET})
 
-add_executable(test_res2
-  test_res2.cpp
-  res2_gen.qrc
-)
-target_link_libraries(test_res2 ${QT_CORE_TARGET})
-
 file(GENERATE
   OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/info_file$<$<BOOL:$<CONFIG>>:_$<CONFIG>>.txt"
-  CONTENT "$<TARGET_FILE:test_res1>\n$<TARGET_FILE:test_res2>\n"
+  CONTENT "$<TARGET_FILE:test_res1>\n"
 )
diff --git a/Tests/QtAutogen/autorcc_depends/res2_gen.qrc b/Tests/QtAutogen/autorcc_depends/res1.qrc
similarity index 61%
rename from Tests/QtAutogen/autorcc_depends/res2_gen.qrc
rename to Tests/QtAutogen/autorcc_depends/res1.qrc
index 525a2fc..cfea618 100644
--- a/Tests/QtAutogen/autorcc_depends/res2_gen.qrc
+++ b/Tests/QtAutogen/autorcc_depends/res1.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>res2_input.txt</file>
+        <file>res1_input.txt</file>
     </qresource>
 </RCC>
diff --git a/Tests/QtAutogen/autorcc_depends/res1.qrc.in b/Tests/QtAutogen/autorcc_depends/res1.qrc.in
deleted file mode 100644
index 7c233cb..0000000
--- a/Tests/QtAutogen/autorcc_depends/res1.qrc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>@CMAKE_CURRENT_SOURCE_DIR@/src_file.txt</file>
-        <file>@CMAKE_CURRENT_BINARY_DIR@/generated.txt</file>
-    </qresource>
-</RCC>
diff --git a/Tests/QtAutogen/autorcc_depends/res2_input.txt b/Tests/QtAutogen/autorcc_depends/res2_input.txt
deleted file mode 100644
index 08e14b7..0000000
--- a/Tests/QtAutogen/autorcc_depends/res2_input.txt
+++ /dev/null
@@ -1 +0,0 @@
-Res2 input.
diff --git a/Tests/QtAutogen/autorcc_depends/src_file.txt b/Tests/QtAutogen/autorcc_depends/src_file.txt
deleted file mode 100644
index 3d54a31..0000000
--- a/Tests/QtAutogen/autorcc_depends/src_file.txt
+++ /dev/null
@@ -1 +0,0 @@
-src file.
diff --git a/Tests/QtAutogen/autorcc_depends/test_res2.cpp b/Tests/QtAutogen/autorcc_depends/test_res2.cpp
deleted file mode 100644
index 766b775..0000000
--- a/Tests/QtAutogen/autorcc_depends/test_res2.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-
-int main()
-{
-  return 0;
-}

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

Summary of changes:
 Tests/QtAutogen/autorcc_depends/CMakeLists.txt        |   17 ++---------------
 .../autorcc_depends/{res2_gen.qrc => res1.qrc}        |    2 +-
 Tests/QtAutogen/autorcc_depends/res1.qrc.in           |    6 ------
 Tests/QtAutogen/autorcc_depends/res2_input.txt        |    1 -
 Tests/QtAutogen/autorcc_depends/src_file.txt          |    1 -
 Tests/QtAutogen/autorcc_depends/test_res2.cpp         |    5 -----
 6 files changed, 3 insertions(+), 29 deletions(-)
 rename Tests/QtAutogen/autorcc_depends/{res2_gen.qrc => res1.qrc} (61%)
 delete mode 100644 Tests/QtAutogen/autorcc_depends/res1.qrc.in
 delete mode 100644 Tests/QtAutogen/autorcc_depends/res2_input.txt
 delete mode 100644 Tests/QtAutogen/autorcc_depends/src_file.txt
 delete mode 100644 Tests/QtAutogen/autorcc_depends/test_res2.cpp


hooks/post-receive
-- 
CMake