[Cmake-commits] CMake branch, next, updated. v2.8.4-940-g64919dd

[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  64919dd12d9e1ace9d6da059e3b9d92c891770c7 (commit)
       via  6a61a8a5383fe7418cdd893c97328a27b86b08da (commit)
      from  a1fb47d8d7ed0bdb40ed3e4f878bb888d54869be (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=64919dd12d9e1ace9d6da059e3b9d92c891770c7
commit 64919dd12d9e1ace9d6da059e3b9d92c891770c7
Merge: a1fb47d 6a61a8a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 21 14:50:54 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 21 14:50:54 2011 -0500

    Merge topic 'mingw-module-definition' into next
    
    6a61a8a Honor module .def files with MinGW tools (#9997)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a61a8a5383fe7418cdd893c97328a27b86b08da
commit 6a61a8a5383fe7418cdd893c97328a27b86b08da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 21 13:30:10 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 21 14:34:54 2011 -0500

    Honor module .def files with MinGW tools (#9997)
    
    Since commit 024d05ad (Fix use of module .def files for MS tools,
    2009-09-29) module .def files work for any platform that sets
    CMAKE_LINK_DEF_FILE_FLAG correctly.  Set it in the Windows-GNU platform
    information file to enable support with MinGW tools.  Also enable the
    test added by commit 0db2c850 (Test use of module .def files for MS
    tools, 2009-09-29) for MinGW and MSYS generators.

diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index 7084b83..8df0bcb 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -43,6 +43,7 @@ endif()
 set(CMAKE_DL_LIBS "")
 set(CMAKE_LIBRARY_PATH_FLAG "-L")
 set(CMAKE_LINK_LIBRARY_FLAG "-l")
+set(CMAKE_LINK_DEF_FILE_FLAG "-Wl,")
 set(CMAKE_LINK_LIBRARY_SUFFIX "")
 set(CMAKE_CREATE_WIN32_EXE  "-mwindows")
 
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2c11919..5dc35ba 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1082,8 +1082,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   IF(CMAKE_TEST_MSVC)
     ADD_TEST_MACRO(ForceInclude foo)
     ADD_TEST_MACRO(PrecompiledHeader foo)
+  ENDIF()
+  IF(CMAKE_TEST_MSVC OR
+      "${CMAKE_TEST_GENERATOR}" MATCHES "(MSYS|MinGW) Makefiles")
     ADD_TEST_MACRO(ModuleDefinition example_exe)
-  ENDIF(CMAKE_TEST_MSVC)
+  ENDIF()
 
   ADD_TEST_MACRO(CheckCompilerRelatedVariables CheckCompilerRelatedVariables)
 

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

Summary of changes:
 Modules/Platform/Windows-GNU.cmake |    1 +
 Tests/CMakeLists.txt               |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake