[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-262-g52af5c5

Brad King brad.king at kitware.com
Mon Nov 3 08:49:26 EST 2014


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  52af5c52f8fc53f53c082b8976bba74dc9bba068 (commit)
       via  6b63942e45ebc8f542ef68359268e215da10c611 (commit)
      from  13cbd0344b9f4a3ecf9e19c42f9125093ca9cc95 (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=52af5c52f8fc53f53c082b8976bba74dc9bba068
commit 52af5c52f8fc53f53c082b8976bba74dc9bba068
Merge: 13cbd03 6b63942
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 3 08:49:25 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 3 08:49:25 2014 -0500

    Merge topic 'watcom-drop-symfile-option' into next
    
    6b63942e Watcom: Drop symfile linker option


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b63942e45ebc8f542ef68359268e215da10c611
commit 6b63942e45ebc8f542ef68359268e215da10c611
Author:     J Decker <d3ck0r at gmail.com>
AuthorDate: Sun Nov 2 13:59:27 2014 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 3 08:46:48 2014 -0500

    Watcom: Drop symfile linker option
    
    Cleanup of Windows-wcl386.cmake in commit v3.1.0-rc1~693^2 (Watcom:
    Cleanup Windows-wcl386 configuration, 2014-04-01) also introduced use of
    the 'symfile' link option but did not mention it in the commit message.
    
    There is no way to set the symbol file name of a target, so it is better
    to revert that change.  It is easy to run 'wstrip *' if the symbols need
    to be stripped, but it is very difficult to get the right names for the
    .sym files to install with debug/rel_with_deb_info configurations.

diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-wcl386.cmake
index ac410de..88f9bf7 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -18,8 +18,8 @@ set(CMAKE_CREATE_CONSOLE_EXE "system nt" )
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "system nt_dll")
 set(CMAKE_MODULE_LINKER_FLAGS_INIT "system nt_dll")
 foreach(type SHARED MODULE EXE)
-  set(CMAKE_${type}_LINKER_FLAGS_DEBUG_INIT "debug all opt map, symfile")
-  set(CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO_INIT "debug all opt map, symfile")
+  set(CMAKE_${type}_LINKER_FLAGS_DEBUG_INIT "debug all opt map")
+  set(CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO_INIT "debug all opt map")
 endforeach()
 
 set(CMAKE_C_COMPILE_OPTIONS_DLL "-bd") # Note: This variable is a ';' separated list

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list