[Cmake-commits] CMake branch, next, updated. v2.8.12-3941-gf8a3fb8

[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  f8a3fb81bc3ea8f8750d5e345f29511680ebf910 (commit)
       via  affabfe61a8b33e29da1bac79b31593825303607 (commit)
      from  d3b8170b1e28a9cce2b90cdcfb4db351b691c5f0 (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=f8a3fb81bc3ea8f8750d5e345f29511680ebf910
commit f8a3fb81bc3ea8f8750d5e345f29511680ebf910
Merge: d3b8170 affabfe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 13 11:00:12 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 13 11:00:12 2013 -0400

    Merge topic 'Qt-auto-generators' into next
    
    affabfe Don't run the QtAutogen test on Windows.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=affabfe61a8b33e29da1bac79b31593825303607
commit affabfe61a8b33e29da1bac79b31593825303607
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 13 16:59:35 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 13 16:59:35 2013 +0200

    Don't run the QtAutogen test on Windows.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 896fb89..0e9bf83 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1015,9 +1015,10 @@ ${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")
+  # On Windows there is no RPATH, so while Qt might be available for building,
+  # the required dlls may not be in the PATH, so we can't run the executables
+  # on that platform.
+  if(WIN32)
     set(run_autogen_test ${CMAKE_CTEST_COMMAND} -V)
   else()
     set(run_autogen_test QtAutogen)

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

Summary of changes:
 Tests/CMakeLists.txt |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake