[Cmake-commits] CMake branch, next, updated. v3.0.1-4960-g754bbb5

[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  754bbb5198c5b7489027c711cb67e6c01763da78 (commit)
       via  8a2e5aa36c4a0f79feda6e0fa2f1eb1adba8c7ed (commit)
      from  f339928e5d211a57584b21c5a1679e22acd5bb88 (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=754bbb5198c5b7489027c711cb67e6c01763da78
commit 754bbb5198c5b7489027c711cb67e6c01763da78
Merge: f339928 8a2e5aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 19 09:37:21 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 19 09:37:21 2014 -0400

    Merge topic 'vs-windows-apps' into next
    
    8a2e5aa3 CMakeDetermineCompilerABI: Link with standard libraries on MSVC


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a2e5aa36c4a0f79feda6e0fa2f1eb1adba8c7ed
commit 8a2e5aa36c4a0f79feda6e0fa2f1eb1adba8c7ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 19 09:04:25 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 19 09:34:35 2014 -0400

    CMakeDetermineCompilerABI: Link with standard libraries on MSVC
    
    In commit v2.8.0~395 (Implicit link info for C, CXX, and Fortran,
    2009-07-23) we added a '-DCMAKE_${lang}_STANDARD_LIBRARIES=' flag to the
    try_compile used to build the ABI detection project.  It is needed when
    detecting the implicit libraries added by the GNU compiler on Windows
    (MinGW tools) to avoid contaminating the list with standard Windows
    libraries.  However, with MSVC we do not detect such implicit link
    libraries anyway, and for some target platforms (e.g. Windows Phone) we
    may need the standard libraries to link the ABI detection executable.
    Drop the flag when detecting the ABI using MSVC.

diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake
index 8595b97..4b7ec30 100644
--- a/Modules/CMakeDetermineCompilerABI.cmake
+++ b/Modules/CMakeDetermineCompilerABI.cmake
@@ -28,13 +28,15 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
     if(DEFINED CMAKE_${lang}_VERBOSE_FLAG)
       set(CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG}")
     endif()
+    if(NOT "x${CMAKE_${lang}_COMPILER_ID}" STREQUAL "xMSVC")
+      # Avoid adding our own platform standard libraries for compilers
+      # from which we might detect implicit link libraries.
+      list(APPEND CMAKE_FLAGS "-DCMAKE_${lang}_STANDARD_LIBRARIES=")
+    endif()
     try_compile(CMAKE_${lang}_ABI_COMPILED
       ${CMAKE_BINARY_DIR} ${src}
-      CMAKE_FLAGS "${CMAKE_FLAGS}"
-                  "-DCMAKE_${lang}_STANDARD_LIBRARIES="
-                  # We need ignore these warnings because some platforms need
-                  # CMAKE_${lang}_STANDARD_LIBRARIES to link properly and we
-                  # don't care when we are just determining the ABI.
+      CMAKE_FLAGS ${CMAKE_FLAGS}
+                  # Ignore unused flags when we are just determining the ABI.
                   "--no-warn-unused-cli"
       OUTPUT_VARIABLE OUTPUT
       COPY_FILE "${BIN}"

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

Summary of changes:
 Modules/CMakeDetermineCompilerABI.cmake |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake