[Cmake-commits] CMake branch, next, updated. v2.8.3-1355-ga612959

[Brad King]

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  a612959338b8c67f8aab903bf77432713aab1bf3 (commit)
       via  aeb6cd8a8920c398b923d3ce383c06ed4643727f (commit)
       via  20d87c8026d3e23d8f9f18b735bc0304ec80d046 (commit)
      from  ea7ad70d1b8496b836932bdb862ae38bcce7efa2 (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=a612959338b8c67f8aab903bf77432713aab1bf3
commit a612959338b8c67f8aab903bf77432713aab1bf3
Merge: ea7ad70 aeb6cd8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 14 10:56:39 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 14 10:56:39 2011 -0500

    Merge topic 'resolve/mingw-cross-compile-resources/honor-explicit-zero-timeout' into next
    
    aeb6cd8 Merge branch 'honor-explicit-zero-timeout' into resolve/mingw-cross-compile-resources/honor-explicit-zero-timeout
    20d87c8 Teach Simple_Mingw_Linux2Win test to use windres


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aeb6cd8a8920c398b923d3ce383c06ed4643727f
commit aeb6cd8a8920c398b923d3ce383c06ed4643727f
Merge: 20d87c8 51bb493
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 14 10:44:41 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 14 10:44:41 2011 -0500

    Merge branch 'honor-explicit-zero-timeout' into resolve/mingw-cross-compile-resources/honor-explicit-zero-timeout
    
    Conflicts:
    	Tests/CMakeLists.txt


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20d87c8026d3e23d8f9f18b735bc0304ec80d046
commit 20d87c8026d3e23d8f9f18b735bc0304ec80d046
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 14 10:22:15 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 14 10:22:15 2011 -0500

    Teach Simple_Mingw_Linux2Win test to use windres
    
    This test was broken by commit b2f308c8 (Add support for windows
    resources with mingw/msys, 2010-12-22) because the test does not set a
    resource compiler which is now required on MinGW for the 'RC' language.
    Use windres as the resource compiler for the test.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8f29641..f70b224 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1694,12 +1694,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
         "-DCMAKE_C_COMPILER=${SDCC_EXECUTABLE}")
       LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/SimpleCOnly_sdcc")
     ENDIF(SDCC_EXECUTABLE)
-    
-    
+
+    # If a Linux -> MinGW cross compiler is found then try it
     FIND_PROGRAM(MINGW_CC_LINUX2WIN_EXECUTABLE i586-mingw32msvc-gcc)
     FIND_PROGRAM(MINGW_CXX_LINUX2WIN_EXECUTABLE i586-mingw32msvc-g++)
-    MARK_AS_ADVANCED(MINGW_CC_LINUX2WIN_EXECUTABLE MINGW_CXX_LINUX2WIN_EXECUTABLE)
-    IF(MINGW_CC_LINUX2WIN_EXECUTABLE  AND  MINGW_CXX_LINUX2WIN_EXECUTABLE)
+    FIND_PROGRAM(MINGW_RC_LINUX2WIN_EXECUTABLE i586-mingw32msvc-windres)
+    MARK_AS_ADVANCED(MINGW_CC_LINUX2WIN_EXECUTABLE MINGW_CXX_LINUX2WIN_EXECUTABLE MINGW_RC_LINUX2WIN_EXECUTABLE)
+    IF(MINGW_CC_LINUX2WIN_EXECUTABLE AND MINGW_CXX_LINUX2WIN_EXECUTABLE AND MINGW_RC_LINUX2WIN_EXECUTABLE)
       ADD_TEST(Simple_Mingw_Linux2Win ${CMAKE_CTEST_COMMAND}
         --build-and-test
         "${CMake_SOURCE_DIR}/Tests/Simple"
@@ -1710,11 +1711,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
         --build-options
         "-DCMAKE_SYSTEM_NAME=Windows"
         "-DCMAKE_C_COMPILER=${MINGW_CC_LINUX2WIN_EXECUTABLE}"
-        "-DCMAKE_CXX_COMPILER=${MINGW_CXX_LINUX2WIN_EXECUTABLE}")
+        "-DCMAKE_CXX_COMPILER=${MINGW_CXX_LINUX2WIN_EXECUTABLE}"
+        "-DCMAKE_RC_COMPILER=${MINGW_RC_LINUX2WIN_EXECUTABLE}"
+        )
       LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Simple_Mingw_Linux2Win")
-    ENDIF(MINGW_CC_LINUX2WIN_EXECUTABLE  AND  MINGW_CXX_LINUX2WIN_EXECUTABLE)
-    
-    
+    ENDIF()
   ENDIF(CMAKE_TEST_GENERATOR MATCHES "Makefiles" OR CMAKE_TEST_GENERATOR MATCHES "KDevelop")
 
   IF(UNIX)

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

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


hooks/post-receive
-- 
CMake