[Cmake-commits] CMake branch, next, updated. v2.8.12-3930-g73d6650

[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  73d66508543e2f23d281bbaf1ea470cd1cc042e6 (commit)
       via  12a949e3358623e8cb488e17a3492e7f36306074 (commit)
      from  3b407cb4b1dcd53658c7be42518cfdcbab2f6644 (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=73d66508543e2f23d281bbaf1ea470cd1cc042e6
commit 73d66508543e2f23d281bbaf1ea470cd1cc042e6
Merge: 3b407cb 12a949e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 13 04:47:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 13 04:47:59 2013 -0400

    Merge topic 'Qt-auto-generators' into next
    
    12a949e Don't attempt to run the test when using bullseye.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12a949e3358623e8cb488e17a3492e7f36306074
commit 12a949e3358623e8cb488e17a3492e7f36306074
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 13 10:45:27 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 13 10:45:27 2013 +0200

    Don't attempt to run the test when using bullseye.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b95ac80..896fb89 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1015,6 +1015,14 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     )
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomocNoQt")
 
+  # The Bullseye appears to not be able to run the executable.
+  execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE out ERROR_VARIABLE out)
+  if("x${out}" MATCHES "Bullseye")
+    set(run_autogen_test ${CMAKE_CTEST_COMMAND} -V)
+  else()
+    set(run_autogen_test QtAutogen)
+  endif()
+
   find_package(Qt5Widgets QUIET NO_MODULE)
   if(Qt5Widgets_FOUND)
     add_test(Qt5Autogen ${CMAKE_CTEST_COMMAND}
@@ -1026,7 +1034,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Autogen"
       --force-new-ctest-process
       --build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=5
-      --test-command QtAutogen
+      --test-command ${run_autogen_test}
       )
     list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Autogen")
   endif()
@@ -1040,7 +1048,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Autogen"
       --force-new-ctest-process
       --build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=4
-      --test-command QtAutogen
+      --test-command ${run_autogen_test}
       )
     list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Autogen")
 

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

Summary of changes:
 Tests/CMakeLists.txt |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake