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 cbd8aca5c680925359fb953287fbace472a4e3cb (commit)
via a0974ae2e69052e343764ddb93749739b7674977 (commit)
from 72860eecf54bbe60b5490f67e6714c1e98dfcdb4 (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=cbd8aca5c680925359fb953287fbace472a4e3cb
commit cbd8aca5c680925359fb953287fbace472a4e3cb
Merge: 72860ee a0974ae
Author: David Cole <david.c...@kitware.com>
AuthorDate: Fri Jul 29 13:59:02 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 29 13:59:02 2011 -0400
Merge topic 'fix-12245-add-wlib--c-flag' into next
a0974ae Watcom: Add -c flag to wlib calls (#12245)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0974ae2e69052e343764ddb93749739b7674977
commit a0974ae2e69052e343764ddb93749739b7674977
Author: David Cole <david.c...@kitware.com>
AuthorDate: Fri Jul 29 13:52:23 2011 -0400
Commit: David Cole <david.c...@kitware.com>
CommitDate: Fri Jul 29 13:52:23 2011 -0400
Watcom: Add -c flag to wlib calls (#12245)
Allows wlib to generate proper exports if two routines have
the same spelling, but different case (like Scale and scale).
Thanks to J Decker for the patch.
diff --git a/Modules/Platform/Windows-wcl386.cmake
b/Modules/Platform/Windows-wcl386.cmake
index e96ebb5..f184e23 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -39,7 +39,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 -q -n -b <TARGET_IMPLIB> +'<TARGET_UNQUOTED>'")
+ "wlib -c -q -n -b <TARGET_IMPLIB> +'<TARGET_UNQUOTED>'")
SET(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
SET(CMAKE_C_LINK_EXECUTABLE
@@ -77,7 +77,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} -n -b
'<TARGET_UNQUOTED>' <LINK_FLAGS> <OBJECTS> ")
+SET(CMAKE_CXX_CREATE_STATIC_LIBRARY "wlib ${CMAKE_LIB_QUIET} -c -n -b
'<TARGET_UNQUOTED>' <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 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
