[Cmake-commits] CMake branch, next, updated. v2.8.3-1615-g4800f23

[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  4800f23ee3a95ec325511c1f527a524833cefb04 (commit)
       via  3b77516862e6e7991a5c6f16a0979dccfa439fce (commit)
      from  6500866be0f08c767970c7c5528e80876ba336f7 (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=4800f23ee3a95ec325511c1f527a524833cefb04
commit 4800f23ee3a95ec325511c1f527a524833cefb04
Merge: 6500866 3b77516
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 11 09:02:52 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 11 09:02:52 2011 -0500

    Merge topic 'init-LDFLAGS-issue-11840' into next
    
    3b77516 Fix linker flag initialization from LDFLAGS (#11840)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b77516862e6e7991a5c6f16a0979dccfa439fce
commit 3b77516862e6e7991a5c6f16a0979dccfa439fce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 11 08:54:38 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 11 08:54:38 2011 -0500

    Fix linker flag initialization from LDFLAGS (#11840)
    
    When initializing CMAKE_(EXE|SHARED|MODULE)_LINKER_FLAGS from LDFLAGS
    and CMAKE_(EXE|SHARED|MODULE)_LINKER_FLAGS_INIT quote the whole string
    in case both are set.
    
    Reported-by: Daniel R. Gomez <gomez at teragram.com>

diff --git a/Modules/CMakeCommonLanguageInclude.cmake b/Modules/CMakeCommonLanguageInclude.cmake
index 237f8dd..a2929f1 100644
--- a/Modules/CMakeCommonLanguageInclude.cmake
+++ b/Modules/CMakeCommonLanguageInclude.cmake
@@ -16,7 +16,7 @@
 # cache values that can be initialized in the platform-compiler.cmake file
 # it may be included by more than one language.
 
-SET (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS_INIT} $ENV{LDFLAGS}
+SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_INIT} $ENV{LDFLAGS}"
      CACHE STRING "Flags used by the linker.")
 
 
@@ -70,11 +70,11 @@ IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
 
 ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
 # shared linker flags
-SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_INIT} $ENV{LDFLAGS}
+SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} $ENV{LDFLAGS}"
      CACHE STRING "Flags used by the linker during the creation of dll's.")
 
 # module linker flags
-SET (CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS_INIT} $ENV{LDFLAGS}
+SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS_INIT} $ENV{LDFLAGS}"
      CACHE STRING "Flags used by the linker during the creation of modules.")
 
 SET(CMAKE_BUILD_TOOL ${CMAKE_MAKE_PROGRAM} CACHE INTERNAL 

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

Summary of changes:
 Modules/CMakeCommonLanguageInclude.cmake |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake