[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1878-ge71cffd

[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  e71cffd131ec556fdb695ff32698a86fa0289dfb (commit)
       via  5c5be193cf86f86fb6e9c0c0bd4f01eb1dfa8d08 (commit)
      from  5a92c9e34fed3dfa47f924da0f9495f662021642 (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=e71cffd131ec556fdb695ff32698a86fa0289dfb
commit e71cffd131ec556fdb695ff32698a86fa0289dfb
Merge: 5a92c9e 5c5be19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 28 13:44:18 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 28 13:44:18 2014 -0500

    Merge topic 'watcom-wlib-quoting' into next
    
    5c5be193 Watcom: Fix static library name quoting for wlib


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c5be193cf86f86fb6e9c0c0bd4f01eb1dfa8d08
commit 5c5be193cf86f86fb6e9c0c0bd4f01eb1dfa8d08
Author:     Jiri Malak <malak.jiri at gmail.com>
AuthorDate: Fri Feb 28 18:21:52 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 28 13:34:59 2014 -0500

    Watcom: Fix static library name quoting for wlib
    
    Use double-quotes instead of single-quotes around the static library
    target name in 'wlib' invocations.

diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-wcl386.cmake
index 8a03b29..2d5050a 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -40,7 +40,7 @@ set (CMAKE_C_STANDARD_LIBRARIES_INIT "library clbrdll.lib library plbrdll.lib  l
 set (CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
 
 set(CMAKE_C_CREATE_IMPORT_LIBRARY
-  "wlib -c -q -n -b <TARGET_IMPLIB> +'<TARGET_UNQUOTED>'")
+  "wlib -c -q -n -b <TARGET_IMPLIB> +<TARGET_QUOTED>")
 set(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
 
 set(CMAKE_C_LINK_EXECUTABLE
@@ -78,7 +78,7 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY ${CMAKE_CXX_CREATE_SHARED_LIBRARY})
 set(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_MODULE})
 
 # create a C++ static library
-set(CMAKE_CXX_CREATE_STATIC_LIBRARY  "wlib ${CMAKE_LIB_QUIET} -c -n -b '<TARGET_UNQUOTED>' <LINK_FLAGS> <OBJECTS> ")
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY  "wlib ${CMAKE_LIB_QUIET} -c -n -b <TARGET_QUOTED> <LINK_FLAGS> <OBJECTS> ")
 
 # create a C static library
 set(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})

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

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


hooks/post-receive
-- 
CMake