[127220] trunk/dports/devel/cmake

[jmr at macports.org]

Revision: 127220
          https://trac.macports.org/changeset/127220
Author:   jmr at macports.org
Date:     2014-10-23 11:57:44 -0700 (Thu, 23 Oct 2014)
Log Message:
-----------
cmake: don't error out when using a deployment target and no SDK (#44581, maintainer timeout)

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

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2014-10-23 18:44:41 UTC (rev 127219)
+++ trunk/dports/devel/cmake/Portfile	2014-10-23 18:57:44 UTC (rev 127220)
@@ -6,6 +6,7 @@
 
 name                cmake
 version             3.0.2
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel
 license             BSD

Modified: trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff	2014-10-23 18:44:41 UTC (rev 127219)
+++ trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff	2014-10-23 18:57:44 UTC (rev 127220)
@@ -1,12 +1,35 @@
-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)
+--- Modules/Platform/Darwin.cmake.orig	2014-09-11 23:24:00.000000000 +1000
++++ Modules/Platform/Darwin.cmake	2014-10-21 14:02:52.000000000 +1100
+@@ -140,12 +140,18 @@
+       else()
+         set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
+         set(_CMAKE_OSX_SYSROOT_DEFAULT "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
+-        message(WARNING
+-          "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
+-          "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
+-          "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"\n"
+-          "matching the host OS X version."
+-          )
++        if(IS_DIRECTORY "${_CMAKE_OSX_SYSROOT_DEFAULT}")
++          if (NOT "${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "${_CURRENT_OSX_VERSION}")
++            message(WARNING
++              "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
++              "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
++              "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"\n"
++              "matching the host OS X version."
++              )
++          endif()
++        else ()
++          set(_CMAKE_OSX_SYSROOT_DEFAULT "")
++        endif()
+       endif()
+     else()
+       set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
+@@ -207,6 +213,8 @@
      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 "/")
++  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/" OR "${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "")
 +    set(_sdk_ver "${_CURRENT_OSX_VERSION}")
    else()
      message(FATAL_ERROR
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141023/597c1836/attachment-0001.html>