[Cmake-commits] CMake branch, next, updated. v3.1.0-1809-g3a9a73e

Stephen Kelly steveire at gmail.com
Mon Jan 12 14:13:05 EST 2015


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  3a9a73e5844742fbe269e682723c39a15497b740 (commit)
       via  ec86e2d16bae7fb7e7398f6d5b9d660995cfbb10 (commit)
      from  258b54be2e083734d08962b84ee30b4e83f02e9f (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=3a9a73e5844742fbe269e682723c39a15497b740
commit 3a9a73e5844742fbe269e682723c39a15497b740
Merge: 258b54b ec86e2d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 14:13:05 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 12 14:13:05 2015 -0500

    Merge topic 'Apple-compiler-selection' into next
    
    ec86e2d1 Fix incorrect cache setting.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec86e2d16bae7fb7e7398f6d5b9d660995cfbb10
commit ec86e2d16bae7fb7e7398f6d5b9d660995cfbb10
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 20:12:00 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jan 12 20:12:43 2015 +0100

    Fix incorrect cache setting.

diff --git a/Modules/CMakeDetermineCompiler.cmake b/Modules/CMakeDetermineCompiler.cmake
index 01e91f2..7b21dcf 100644
--- a/Modules/CMakeDetermineCompiler.cmake
+++ b/Modules/CMakeDetermineCompiler.cmake
@@ -79,7 +79,7 @@ macro(_cmake_find_compiler lang)
         OUTPUT_VARIABLE _xcrun_out OUTPUT_STRIP_TRAILING_WHITESPACE
         ERROR_VARIABLE _xcrun_err)
       if(_xcrun_out)
-        set(CMAKE_${lang}_COMPILER "${_xcrun_out}" CACHE PATH "${lang} compiler")
+        set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE "${_xcrun_out}")
         break()
       endif()
     endforeach()

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

Summary of changes:
 Modules/CMakeDetermineCompiler.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list