[Cmake-commits] CMake branch, next, updated. v2.8.5-1337-g9371ff1

[David Cole]

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  9371ff19cfb91eb3b284f6d5c06f2783e410d174 (commit)
       via  0baf5659c6222175b5d0a5b47d45e145dbdb8400 (commit)
       via  5ef20b2dc54474ceba1c81a75e8c3fc558d505fa (commit)
      from  6e445fce2dc0c882f9b8a584e5b870c063311544 (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=9371ff19cfb91eb3b284f6d5c06f2783e410d174
commit 9371ff19cfb91eb3b284f6d5c06f2783e410d174
Merge: 6e445fc 0baf565
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jul 29 11:31:51 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 29 11:31:51 2011 -0400

    Merge topic 'adjust-path-for-all-generators-test' into next
    
    0baf565 Ensure libgmp-10.dll is in the PATH for CMakeTestAllGenerators
    5ef20b2 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0baf5659c6222175b5d0a5b47d45e145dbdb8400
commit 0baf5659c6222175b5d0a5b47d45e145dbdb8400
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jul 29 11:04:48 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Jul 29 11:13:33 2011 -0400

    Ensure libgmp-10.dll is in the PATH for CMakeTestAllGenerators
    
    But only if it exists at the default location:
    C:/MinGW/bin/libgmp-10.dll
    
    This is so that the pop-up dialog about not being able to load
    that dll does not hang the test when there's nobody watching.

diff --git a/Tests/CMakeTestAllGenerators/RunCMake.cmake b/Tests/CMakeTestAllGenerators/RunCMake.cmake
index dcf4a23..6d27d3b 100644
--- a/Tests/CMakeTestAllGenerators/RunCMake.cmake
+++ b/Tests/CMakeTestAllGenerators/RunCMake.cmake
@@ -60,6 +60,28 @@ message(STATUS "CTEST_FULL_OUTPUT (Avoid ctest truncation of output)")
 
 message(STATUS "CMake generators='${generators}'")
 
+# If we'll be testing any of the MinGW Makefiles generators, adjust the
+# ENV{PATH} to make sure libgmp-10.dll can be loaded as needed. But only if
+# the testing machine has a default MinGW install... (If you have a
+# non-default install, append to the PATH before running the test...)
+#
+if(generators MATCHES "MinGW Makefiles")
+  if(EXISTS "C:/MinGW/bin/libgmp-10.dll")
+    string(TOLOWER "$ENV{PATH}" path)
+    if(NOT path MATCHES "/mingw/bin")
+      if(UNIX)
+        set(sep ":")
+        set(mingw_bin "/mingw/bin")
+      else()
+        set(sep ";")
+        set(mingw_bin "C:/MinGW/bin")
+      endif()
+      set(ENV{PATH} "$ENV{PATH}${sep}${mingw_bin}")
+      message(STATUS "info: appending '${sep}${mingw_bin}' to the PATH")
+    endif()
+  endif()
+endif()
+
 # First setup a source tree to run CMake on.
 #
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory

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

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake           |    2 +-
 Tests/CMakeTestAllGenerators/RunCMake.cmake |   22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake