<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96714bed88ddb2eb42105fe4b0b546c6d55d77e1">https://github.com/macports/macports-ports/commit/96714bed88ddb2eb42105fe4b0b546c6d55d77e1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 96714be cmake: update release to 3.14.0 and devel to 2efecea4 (20190314)
</span>96714be is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 96714bed88ddb2eb42105fe4b0b546c6d55d77e1
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Mar 15 02:53:20 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake: update release to 3.14.0 and devel to 2efecea4 (20190314)
</span>---
devel/cmake/Portfile | 20 ++++----
.../patch-CMakeFindFrameworks.cmake.release.diff | 2 +-
.../files/patch-Modules-noArchCheck.release.diff | 36 +++++++++++----
.../files/patch-fix_cxx14_17_checks.release.diff | 53 ++++++++++++++--------
devel/cmake/files/patch-qt4gui.devel.diff | 2 +-
devel/cmake/files/patch-qt4gui.release.diff | 27 +++++++----
devel/cmake/files/patch-qt5gui.devel.diff | 2 +-
devel/cmake/files/patch-qt5gui.release.diff | 14 +++---
8 files changed, 99 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cf71ac..68c9b05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,16 +32,16 @@ dist_subdir cmake
</span>
subport cmake-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch 3.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch 3.14
</span>
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${branch}.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6211b5315071015d2a949af077e4301c47e36fd4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8617881
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${branch}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9edfb583b9417b12e95cdcb56776a41d4d0b2663 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aa76ba67b3c2af1946701f847073f4652af5cbd9f141f221c97af99127e75502 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8846626
</span> revision 0
master_sites ${homepage}/files/v${branch}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,11 +66,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190309
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 5c106bfc42a5eb068719c3dec28ddc6dfc493973
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 82111ce8138e8226fb7866b77bdc94ab259592c0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e80c24da0346db8fe185d49956c19ece03a00fdb1281491a666895a502d20eb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6610127
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190314
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 2efecea485a76df149ecc5d644cc2a1ec6c33cf3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1fa0a04427c14830387d0af026e565d4f3ca972f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8c23d5cd7cd72f5b89c5a9291292747ca022fe0ccfd46a16e37ca05bce56588a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6827156
</span> revision 0
use_bzip2 yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff b/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ef90caa..9261a14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Modules/CMakeFindFrameworks.cmake.orig
+++ Modules/CMakeFindFrameworks.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,6 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,7 @@
</span> if(APPLE)
foreach(dir
~/Library/Frameworks/${fwk}.framework
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-noArchCheck.release.diff b/devel/cmake/files/patch-Modules-noArchCheck.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 373f0b6..5d79d80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-noArchCheck.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Modules-noArchCheck.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> --- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,15 +17,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PACKAGE_VERSION_EXACT TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,15 +23,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span> endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,12 +18,11 @@
</span> -endif()
--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,16 +32,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PACKAGE_VERSION_EXACT TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,15 +38,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span> endif()
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span> -# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
- return()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +36,28 @@
</span> -endif()
--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,16 +31,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PACKAGE_VERSION_EXACT TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,15 +37,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span> endif()
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/BasicConfigVersion-SameMinorVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/BasicConfigVersion-SameMinorVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,15 +41,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> -
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff b/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 045ee55..7baa264 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,8 @@
</span> --- Source/Checks/cm_cxx14_check.cpp.orig
+++ Source/Checks/cm_cxx14_check.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,8 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,15 +1,16 @@
</span> -#include <cstdio>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <iterator>
</span> +// actually use c++14 feature to force the compiler to do something,
+// since it might otherwise try to optimize all of this out even if it
+// doesn't understand it.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +15,14 @@
</span> +main
+(void)
{
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int b[] = { 2, 1, 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto bi = std::cend(b);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - std::unique_ptr<int> u(new int(0));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return *u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return *u + *ai + *(bi - 1);
</span> + std::unique_ptr < int > foo = std::make_unique < int > (4);
+ std::cout << "std::make_unique < int >(4) is '"
+ << *foo << "'" << std::endl;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,37 +30,45 @@
</span> }
--- Source/Checks/cm_cxx17_check.cpp.orig
+++ Source/Checks/cm_cxx17_check.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,9 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,18 +1,27 @@
</span> -#include <cstdio>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <iterator>
</span> -#include <memory>
-#include <unordered_map>
+// requires c++17 or newer, so will fail tests of c++14 or earlier
+#include <optional>
-int main()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int b[] = { 2, 1, 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto bi = std::cend(b);
</span> +#include <iostream>
+#include <string>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto ci = std::size(a);
</span> +std::optional < std::string >
+create
+(bool b) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (b) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "foo!";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return "foo!";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return {};
</span> +}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::unique_ptr<int> u(new int(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci));
</span> +int
+main
+(void)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::unique_ptr<int> u(new int(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return *u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::cout << "create(false) returned "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << create(false).value_or("empty")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::cout << "create(true) returned "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << create(true).value_or("empty")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cout << "create(false) returned "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << create(false).value_or("empty")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cout << "create(true) returned "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << create(true).value_or("empty")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.devel.diff b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 47912f3..6d78821 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +157,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -691,12 +691,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -708,12 +708,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.release.diff b/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 35a61c3..36ea580 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,89 +6,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,100 +6,6 @@
</span> cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,20 @@
</span> - macro(qt4_add_resources)
- qt5_add_resources(${ARGN})
- endmacro()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
- set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Try to find the package WinExtras for the task bar progress
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Qt5WinExtras QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Qt5WinExtras_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(${Qt5WinExtras_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_definitions(-DQT_WINEXTRAS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND CMake_QT_LIBRARIES ${Qt5WinExtras_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - # Remove this when the minimum version of Qt is 4.6.
- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +101,7 @@
</span> set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,8 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,8 +17,6 @@
</span>
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +110,7 @@
</span> set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +61,7 @@
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +119,7 @@
</span> set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,7 +78,7 @@
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +128,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,7 +104,7 @@
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +137,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +150,7 @@
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,7 +146,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -246,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,7 +161,7 @@
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +157,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -702,12 +702,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -699,12 +699,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt5gui.devel.diff b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 28071b3..93139e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -691,12 +691,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -708,12 +708,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt5gui.release.diff b/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 60c93ee..9953fd9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> include_directories(${Qt5Widgets_INCLUDE_DIRS})
add_definitions(${Qt5Widgets_DEFINITONS})
macro(qt4_wrap_ui)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,19 +90,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,19 +101,6 @@
</span> get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@
</span>
set(SRCS
AddCacheEntry.cxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +146,7 @@
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@
</span> set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +152,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,7 +163,7 @@
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,7 +178,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,7 +189,7 @@
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +224,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +235,7 @@
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -246,7 +235,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,7 +246,7 @@
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -702,12 +702,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -699,12 +699,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</pre><pre style='margin:0'>
</pre>