[Cmake-commits] CMake branch, next, updated. v2.8.6-2168-g87a1ebc

Brad King brad.king at kitware.com
Thu Dec 8 13:35:23 EST 2011


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  87a1ebc9c7a9d3ed0723405c90f1e48aeaaf4562 (commit)
       via  c213eb9cbf73c2d0ad723f1afb079508a731410f (commit)
      from  b721d7d0c9754e59f613e16c8580336d8e3c724b (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=87a1ebc9c7a9d3ed0723405c90f1e48aeaaf4562
commit 87a1ebc9c7a9d3ed0723405c90f1e48aeaaf4562
Merge: b721d7d c213eb9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 8 13:35:21 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 8 13:35:21 2011 -0500

    Merge topic 'GNU-to-MS' into next
    
    c213eb9 Windows-GNU: Remove extra quotes in GNUtoMS rule variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c213eb9cbf73c2d0ad723f1afb079508a731410f
commit c213eb9cbf73c2d0ad723f1afb079508a731410f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 8 13:28:14 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 8 13:28:37 2011 -0500

    Windows-GNU: Remove extra quotes in GNUtoMS rule variable
    
    CMake replaces the <TARGET...> tokens with properly quoted values so we
    do not need an extra set of quotes around them.

diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index c255d6b..dd47692 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -175,7 +175,7 @@ macro(__windows_compiler_gnu_abi lang)
   if(CMAKE_GNUtoMS)
     # Teach CMake how to create a MS import library at link time.
     set(CMAKE_${lang}_GNUtoMS_RULE " -Wl,--output-def,<TARGET_NAME>.def"
-      "<CMAKE_COMMAND> -Dlib=\"${CMAKE_GNUtoMS_LIB}\" -Ddef=\"<TARGET_NAME>.def\" -Ddll=\"<TARGET>\" -Dimp=\"<TARGET_IMPLIB>\" -P \"${CMAKE_ROOT}/Modules/Platform/GNUtoMS_lib.cmake\""
+      "<CMAKE_COMMAND> -Dlib=\"${CMAKE_GNUtoMS_LIB}\" -Ddef=<TARGET_NAME>.def -Ddll=<TARGET> -Dimp=<TARGET_IMPLIB> -P \"${CMAKE_ROOT}/Modules/Platform/GNUtoMS_lib.cmake\""
       )
   endif()
 endmacro()

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list