[Cmake-commits] CMake branch, next, updated. v2.8.3-1548-g19aa60d

David Cole david.cole at kitware.com
Tue Feb 1 14:34:27 EST 2011


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  19aa60d1da62dd95021d975aa406403f3c5b3d9c (commit)
       via  d421a433a89064926ae6aad532850b8bed113562 (commit)
      from  c034167a0a9a400f24235dde146316635cb052df (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=19aa60d1da62dd95021d975aa406403f3c5b3d9c
commit 19aa60d1da62dd95021d975aa406403f3c5b3d9c
Merge: c034167 d421a43
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Feb 1 14:33:44 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 1 14:33:44 2011 -0500

    Merge topic 'fix-10723-non-dev-xcode' into next
    
    d421a43 Strip trailing space from xcode-select output (#10723)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d421a433a89064926ae6aad532850b8bed113562
commit d421a433a89064926ae6aad532850b8bed113562
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Feb 1 14:16:30 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Feb 1 14:16:30 2011 -0500

    Strip trailing space from xcode-select output (#10723)
    
    Otherwise, subsequent use of the output does not work
    as intended.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index a99ff4a..c11c8fb 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -68,7 +68,8 @@ IF(NOT _CMAKE_OSX_SDKS)
   FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select)
   IF(CMAKE_XCODE_SELECT)
     EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path"
-      OUTPUT_VARIABLE OSX_DEVELOPER_ROOT)
+      OUTPUT_VARIABLE OSX_DEVELOPER_ROOT
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
     FILE(GLOB _CMAKE_OSX_SDKS "${OSX_DEVELOPER_ROOT}/SDKs/*")
   ENDIF(CMAKE_XCODE_SELECT)
 ENDIF(NOT _CMAKE_OSX_SDKS)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list