[Cmake-commits] CMake branch, next, updated. v2.8.2-360-g3ee7168

[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  3ee7168e810e1a6c55d350366d110fb622ebb635 (commit)
       via  b03f4ec09d5d680f63b88aa93b80a741c1dd12ab (commit)
      from  a2515f8d2ab02403a661e680785b4f3abc927b9e (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=3ee7168e810e1a6c55d350366d110fb622ebb635
commit 3ee7168e810e1a6c55d350366d110fb622ebb635
Merge: a2515f8 b03f4ec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 6 09:41:31 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 6 09:41:31 2010 -0400

    Merge topic 'mingw-response-files' into next
    
    b03f4ec No response files with GNU ld <= 2.16 (#10913)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b03f4ec09d5d680f63b88aa93b80a741c1dd12ab
commit b03f4ec09d5d680f63b88aa93b80a741c1dd12ab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 6 09:34:53 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 6 09:34:53 2010 -0400

    No response files with GNU ld <= 2.16 (#10913)
    
    Older GNU ld does not support the @FILE syntax for response files.
    Check the ld version on MinGW and MSYS before enabling the syntax.

diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index af03841..8299d70 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -49,6 +49,13 @@ set(CMAKE_CREATE_WIN32_EXE  "-mwindows")
 set(CMAKE_GNULD_IMAGE_VERSION
   "-Wl,--major-image-version,<TARGET_VERSION_MAJOR>,--minor-image-version,<TARGET_VERSION_MINOR>")
 
+# Check if GNU ld is too old to support @FILE syntax.
+set(__WINDOWS_GNU_LD_RESPONSE 1)
+execute_process(COMMAND ld -v OUTPUT_VARIABLE _help ERROR_VARIABLE _help)
+if("${_help}" MATCHES "GNU ld .* 2\\.1[1-6]")
+  set(__WINDOWS_GNU_LD_RESPONSE 0)
+endif()
+
 macro(__windows_compiler_gnu lang)
 
   if(MSYS OR MINGW)
@@ -68,7 +75,7 @@ macro(__windows_compiler_gnu lang)
   endif()
 
   set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "") # No -fPIC on Windows
-  set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+  set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS ${__WINDOWS_GNU_LD_RESPONSE})
   set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "-Wl,@")
 
   # Binary link rules.

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

Summary of changes:
 Modules/Platform/Windows-GNU.cmake |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake