[Cmake-commits] [cmake-commits] king committed Windows-wcl386.cmake 1.8 1.9

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv27702/Modules/Platform

Modified Files:
	Windows-wcl386.cmake 
Log Message:
Singly-quote target names for Watcom linker

The Watcom tools do their own command-line parsing and do not accept
double-quotes.  Instead we single-quote the target output name when
invoking wlink and other Watcom tools.  This fixes support for spaces in
the target output directory path when it is not under the build tree.


Index: Windows-wcl386.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-wcl386.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** Windows-wcl386.cmake	23 Jan 2008 18:30:55 -0000	1.8
--- Windows-wcl386.cmake	30 Nov 2009 16:16:22 -0000	1.9
***************
*** 28,36 ****
  
  SET(CMAKE_C_CREATE_IMPORT_LIBRARY
!   "wlib -q -n -b <TARGET_IMPLIB> +<TARGET>")
  SET(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
  
  SET(CMAKE_C_LINK_EXECUTABLE
!     "wlink ${CMAKE_START_TEMP_FILE} ${CMAKE_WLINK_QUIET} name <TARGET> option caseexact file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
  
  SET(CMAKE_CXX_LINK_EXECUTABLE ${CMAKE_C_LINK_EXECUTABLE})
--- 28,36 ----
  
  SET(CMAKE_C_CREATE_IMPORT_LIBRARY
!   "wlib -q -n -b <TARGET_IMPLIB> +'<TARGET_UNQUOTED>'")
  SET(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
  
  SET(CMAKE_C_LINK_EXECUTABLE
!     "wlink ${CMAKE_START_TEMP_FILE} ${CMAKE_WLINK_QUIET} name '<TARGET_UNQUOTED>' option caseexact file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
  
  SET(CMAKE_CXX_LINK_EXECUTABLE ${CMAKE_C_LINK_EXECUTABLE})
***************
*** 53,57 ****
  
  SET(CMAKE_CXX_CREATE_SHARED_MODULE
!  "wlink ${CMAKE_START_TEMP_FILE} system nt_dll  ${CMAKE_WLINK_QUIET} name <TARGET> option caseexact  file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
  SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
    ${CMAKE_CXX_CREATE_SHARED_MODULE}
--- 53,57 ----
  
  SET(CMAKE_CXX_CREATE_SHARED_MODULE
!  "wlink ${CMAKE_START_TEMP_FILE} system nt_dll  ${CMAKE_WLINK_QUIET} name '<TARGET_UNQUOTED>' option caseexact  file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
  SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
    ${CMAKE_CXX_CREATE_SHARED_MODULE}
***************
*** 65,69 ****
  
  # create a C++ static library
! SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  "wlib ${CMAKE_LIB_QUIET} -n -b <TARGET> <OBJECTS> ")
  
  # create a C static library
--- 65,69 ----
  
  # create a C++ static library
! SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  "wlib ${CMAKE_LIB_QUIET} -n -b '<TARGET_UNQUOTED>' <OBJECTS> ")
  
  # create a C static library