[122338] trunk/dports/devel/cmake

[jeremyhu at macports.org]

Revision: 122338
          https://trac.macports.org/changeset/122338
Author:   jeremyhu at macports.org
Date:     2014-07-21 00:43:31 -0700 (Mon, 21 Jul 2014)
Log Message:
-----------
cmake: Make cmake less stupid by allowing choosing / for the sysroot when a deployment target is set (#44125)

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile

Added Paths:
-----------
    trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2014-07-21 05:31:54 UTC (rev 122337)
+++ trunk/dports/devel/cmake/Portfile	2014-07-21 07:43:31 UTC (rev 122338)
@@ -6,7 +6,7 @@
 
 name                cmake
 version             3.0.0
-revision            2
+revision            3
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel
 license             BSD
@@ -35,6 +35,7 @@
 patchfiles          patch-CMakeFindFrameworks.cmake.diff \
                     patch-Modules-FindFreetype.cmake.diff \
                     patch-Modules-FindQt4.cmake.diff \
+                    patch-Modules-Platform-Darwin.cmake.diff \
                     patch-Modules-noArchCheck.diff
 
 # fix for swig issues in 3.0.0; remove after 3.0.1 is released

Added: trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff	                        (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff	2014-07-21 07:43:31 UTC (rev 122338)
@@ -0,0 +1,13 @@
+http://trac.macports.org/ticket/44125
+
+--- Modules/Platform/Darwin.cmake.orig	2014-06-09 08:46:52.000000000 -0700
++++ Modules/Platform/Darwin.cmake	2014-07-19 20:43:20.000000000 -0700
+@@ -207,6 +207,8 @@ if(CMAKE_OSX_DEPLOYMENT_TARGET)
+     set(_sdk_ver "${CMAKE_MATCH_1}")
+   elseif("${_CMAKE_OSX_SYSROOT_ORIG}" MATCHES "^macosx([0-9]+\\.[0-9]+)$")
+     set(_sdk_ver "${CMAKE_MATCH_1}")
++  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/")
++    set(_sdk_ver "${_CURRENT_OSX_VERSION}")
+   else()
+     message(FATAL_ERROR
+       "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140721/76d944d7/attachment-0001.html>