Ticket #46493: cmake_3.1.2.diff
| File cmake_3.1.2.diff, 7.5 KB (added by michaelld (Michael Dickens), 9 years ago) |
|---|
-
Portfile
5 5 PortGroup muniversal 1.0 6 6 7 7 name cmake 8 version 3.0.2 9 revision 1 8 version 3.1.2 10 9 set branch [join [lrange [split ${version} .] 0 1] .] 11 10 categories devel 12 11 license BSD 13 12 installs_libs no 14 maintainers css 13 maintainers css michaelld 15 14 description Cross-platform make 16 15 long_description An extensible, open-source system that manages the build \ 17 16 process in an operating system and compiler independent manner. \ … … 21 20 master_sites http://www.cmake.org/files/v${branch}/ 22 21 platforms darwin freebsd 23 22 24 checksums rmd160 b94ea2ed4dced373e289fa5f66674a227135f350\25 sha256 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e23 checksums rmd160 50caf6ff5de97390decf43446ef0733750a5862c \ 24 sha256 2b210f7d867a1e716c1895357ebe63c7b9ae61fdb5f2d300ab2f01795f085b35 26 25 27 26 depends_lib-append port:libidn \ 28 27 port:openssl \ … … 36 35 patch-Modules-FindFreetype.cmake.diff \ 37 36 patch-Modules-FindQt4.cmake.diff \ 38 37 patch-Modules-Platform-Darwin.cmake.diff \ 38 patch-Modules-Platform-Darwin-Initialize.cmake.diff \ 39 39 patch-Modules-noArchCheck.diff 40 40 41 41 configure.env-append \ -
files/patch-Modules-FindFreetype.cmake.diff
1 --- Modules/FindFreetype.cmake.orig 2 +++ Modules/FindFreetype.cmake 3 @@ -5 5,10 +55,6 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h1 --- Modules/FindFreetype.cmake.orig 2015-02-04 15:36:43.000000000 -0500 2 +++ Modules/FindFreetype.cmake 2015-02-09 10:34:02.000000000 -0500 3 @@ -57,10 +57,6 @@ 4 4 HINTS 5 5 ENV FREETYPE_DIR 6 6 PATHS … … 11 11 ENV GTKMM_BASEPATH 12 12 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] 13 13 [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] 14 @@ -7 2,10 +68,6 @@ find_path(FREETYPE_INCLUDE_DIR_freetype214 @@ -78,10 +74,6 @@ 15 15 HINTS 16 16 ENV FREETYPE_DIR 17 17 PATHS … … 22 22 ENV GTKMM_BASEPATH 23 23 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] 24 24 [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] 25 @@ -88,10 +80,6 @@ find_library(FREETYPE_LIBRARY 25 @@ -99,10 +91,6 @@ 26 HINTS 26 27 ENV FREETYPE_DIR 27 PATH_SUFFIXES lib28 28 PATHS 29 29 - /usr/X11R6 30 30 - /usr/local/X11R6 -
files/patch-Modules-FindQt4.cmake.diff
1 --- Modules/FindQt4.cmake.orig 2 +++ Modules/FindQt4.cmake 3 @@ -7 28,9 +728,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)1 --- Modules/FindQt4.cmake.orig 2015-02-04 15:36:43.000000000 -0500 2 +++ Modules/FindQt4.cmake 2015-02-09 10:34:02.000000000 -0500 3 @@ -741,9 +741,7 @@ 4 4 find_path(QT_IMPORTS_DIR NAMES Qt 5 5 HINTS ${qt_cross_paths} ${qt_imports_dir} 6 6 DOC "The location of the Qt imports" -
files/patch-Modules-Platform-Darwin-Initialize.cmake.diff
1 --- Modules/Platform/Darwin-Initialize.cmake.orig 2015-02-09 10:55:45.000000000 -0500 2 +++ Modules/Platform/Darwin-Initialize.cmake 2015-02-09 10:58:06.000000000 -0500 3 @@ -94,11 +94,17 @@ 4 NOT CMAKE_OSX_DEPLOYMENT_TARGET VERSION_EQUAL ${_CMAKE_OSX_DEPLOYMENT_TARGET}) 5 set(_CMAKE_OSX_SDKS_VER ${CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${CMAKE_OSX_DEPLOYMENT_TARGET}}) 6 set(_CMAKE_OSX_SYSROOT_CHECK "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk") 7 - message(WARNING 8 - "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' " 9 - "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n" 10 - "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"." 11 - ) 12 + if(IS_DIRECTORY "${_CMAKE_OSX_SYSROOT_DEFAULT}") 13 + if(NOT "${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "${_CURRENT_OSX_VERSION}") 14 + message(WARNING 15 + "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' " 16 + "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n" 17 + "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"." 18 + ) 19 + endif() 20 + else() 21 + set(_CMAKE_OSX_SYSROOT_DEFAULT "") 22 + endif() 23 endif() 24 else() 25 # Assume developer files are in root (such as Xcode 4.5 command-line tools). -
files/patch-Modules-Platform-Darwin.cmake.diff
1 --- Modules/Platform/Darwin.cmake.orig 2014-09-11 23:24:00.000000000 +1000 2 +++ Modules/Platform/Darwin.cmake 2014-10-21 14:02:52.000000000 +1100 3 @@ -140,12 +140,18 @@ 4 else() 5 set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}}) 6 set(_CMAKE_OSX_SYSROOT_DEFAULT "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk") 7 - message(WARNING 8 - "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' " 9 - "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n" 10 - "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"\n" 11 - "matching the host OS X version." 12 - ) 13 + if(IS_DIRECTORY "${_CMAKE_OSX_SYSROOT_DEFAULT}") 14 + if (NOT "${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "${_CURRENT_OSX_VERSION}") 15 + message(WARNING 16 + "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' " 17 + "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n" 18 + "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"\n" 19 + "matching the host OS X version." 20 + ) 21 + endif() 22 + else () 23 + set(_CMAKE_OSX_SYSROOT_DEFAULT "") 24 + endif() 25 endif() 26 else() 27 set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}}) 28 @@ -207,6 +213,8 @@ 1 --- Modules/Platform/Darwin.cmake.orig 2015-02-04 15:36:43.000000000 -0500 2 +++ Modules/Platform/Darwin.cmake 2015-02-09 10:39:29.000000000 -0500 3 @@ -70,7 +70,8 @@ 29 4 set(_sdk_ver "${CMAKE_MATCH_1}") 30 5 elseif("${_CMAKE_OSX_SYSROOT_ORIG}" MATCHES "^macosx([0-9]+\\.[0-9]+)$") 31 6 set(_sdk_ver "${CMAKE_MATCH_1}") 32 + elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/" OR "${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "") 33 + set(_sdk_ver "${_CURRENT_OSX_VERSION}") 7 - elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/") 8 + elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/" OR 9 + "${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "") 10 set(_sdk_ver "${_CURRENT_OSX_VERSION}") 34 11 else() 35 12 message(FATAL_ERROR 36 "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "