<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/bfd3a88109c946d0882b974ed0232e041f340b7d">https://github.com/macports/macports-ports/commit/bfd3a88109c946d0882b974ed0232e041f340b7d</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 bfd3a88 cmake-devel: update to c1930caf (20171116).
</span>bfd3a88 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bfd3a88109c946d0882b974ed0232e041f340b7d
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Nov 16 21:34:38 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to c1930caf (20171116).
</span>---
devel/cmake/Portfile | 8 ++++----
devel/cmake/files/patch-qt4gui.devel.diff | 20 +++++++++++++-------
devel/cmake/files/patch-qt5gui.devel.diff | 10 +++++-----
3 files changed, 22 insertions(+), 16 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 c3ce941..414193d 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;'>@@ -59,10 +59,10 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20171110
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 1a6ef0bdb27fcf07e54a6754235ece70e752aa5c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2e7c247257e523dbb2602733fff2de9a1c0f6a8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 db812fa45b57e6b621369cd25d0c166e909668dc7068db4cd1aee19d206e8b20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20171116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit c1930caffe827b937d05dca9ffb82ba0b0b20eb2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 95b9979a5ac3f4f863949e3f735c1ebc33281e22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9ddf939731c412aeee13e5a09bcc8caa2d0cb465c022860b689b5b11e1a6936e
</span>
master_sites https://gitlab.kitware.com/cmake/cmake/repository/archive.tar.bz2?ref=${commit}&
distname ${name}-${commit}
<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 adc472e..1ba7fa8 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;'>@@ -1,6 +1,6 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,83 +6,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,89 +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;'>@@ -31,6 +31,12 @@
</span> - PROPERTY COMPILE_DEFINITIONS USE_QXcbIntegrationPlugin)
- endif()
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_property(SOURCE CMakeSetup.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROPERTY COMPILE_DEFINITIONS USE_QWindowsIntegrationPlugin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
- # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
- # Qt5 support is missing there.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +69,7 @@
</span> - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
- DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
- ${COMPONENT})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif(WIN32 AND NOT CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
</span> - install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
- "[Paths]\nPlugins = ../${_qt_plugin_dir}\n")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +90,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;'>-@@ -94,8 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,8 +17,6 @@
</span>
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +99,7 @@
</span> set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +61,7 @@
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +108,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;'>-@@ -157,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +78,7 @@
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +117,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
# cmake-gui has not been updated for `include-what-you-use`.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,7 +100,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,7 +100,7 @@
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,7 +126,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;'>-@@ -225,18 +146,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,18 +146,18 @@
</span> ${COMPONENT})
endif()
<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 0ab776f..c237f74 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;'>@@ -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;'>-@@ -82,19 +84,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,19 +90,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;'>-@@ -140,7 +129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +135,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;'>-@@ -157,7 +146,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +152,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})
# cmake-gui has not been updated for `include-what-you-use`.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,7 +168,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,7 +174,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;'>-@@ -225,18 +214,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,18 +220,18 @@
</span> ${COMPONENT})
endif()
</pre><pre style='margin:0'>
</pre>