<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[142713] trunk/dports/devel/cmake/files</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/142713">142713</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-11-20 12:42:01 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cmake*: update Qt4/5 GUI patches; addresses ticket #49685.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakefilespatchqt4guideveldiff">trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchqt4guireleasediff">trunk/dports/devel/cmake/files/patch-qt4gui.release.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchqt5guideveldiff">trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchqt5guireleasediff">trunk/dports/devel/cmake/files/patch-qt5gui.release.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcmakefilespatchqt4guideveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff (142712 => 142713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff 2015-11-20 20:40:27 UTC (rev 142712)
+++ trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff 2015-11-20 20:42:01 UTC (rev 142713)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- Source/QtDialog/CMakeLists.txt.orig
</span><span class="cx"> +++ Source/QtDialog/CMakeLists.txt
</span><del>-@@ -15,74 +15,6 @@
</del><ins>+@@ -15,77 +15,6 @@ if(POLICY CMP0020)
</ins><span class="cx"> cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
</span><span class="cx"> endif()
</span><span class="cx"> CMake_OPTIONAL_COMPONENT(cmake-gui)
</span><span class="lines">@@ -67,23 +67,27 @@
</span><span class="cx"> - endif()
</span><span class="cx"> - endif()
</span><span class="cx"> -
</span><del>-- if(WIN32 AND TARGET Qt5::Core)
</del><ins>+- if(TARGET Qt5::Core)
</ins><span class="cx"> - get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
</span><span class="cx"> - get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
</span><ins>+- if(APPLE)
+- get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
+- endif()
</ins><span class="cx"> - endif()
</span><span class="cx"> -else()
</span><span class="cx"> set(QT_MIN_VERSION "4.4.0")
</span><span class="cx"> find_package(Qt4 REQUIRED)
</span><span class="cx"> if(NOT QT4_FOUND)
</span><del>-@@ -100,7 +32,6 @@
- set(Qt_BIN_DIR ${_Qt_BIN_DIR})
- endif()
- endif()
</del><ins>+@@ -97,8 +26,6 @@ else()
+
+ set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
+
</ins><span class="cx"> -endif()
</span><del>-
</del><ins>+-
</ins><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><del>-@@ -138,7 +69,7 @@
</del><ins>+ AddCacheEntry.h
+@@ -135,7 +62,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</ins><span class="cx"> if(WIN32)
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.rc)
</span><span class="cx"> endif()
</span><span class="lines">@@ -92,23 +96,20 @@
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.icns)
</span><span class="cx"> set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span class="cx"> set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><del>-@@ -155,13 +86,13 @@
</del><ins>+@@ -152,10 +79,10 @@ endif()
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><del>--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+add_executable(cmake-gui WIN32 ${SRCS})
</del><ins>+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
++add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
</ins><span class="cx"> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
</span><del>- if(Qt_BIN_DIR)
- set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
- endif()
</del><span class="cx">
</span><span class="cx"> -if(APPLE)
</span><span class="cx"> +if(APPLEBUNDLE)
</span><span class="cx"> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span class="cx"> LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span class="cx">
</span><del>-@@ -206,18 +137,18 @@
</del><ins>+@@ -200,18 +127,18 @@ if(UNIX AND NOT APPLE)
</ins><span class="cx"> ${COMPONENT})
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="lines">@@ -130,9 +131,9 @@
</span><span class="cx"> set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
</span><span class="cx"> endif()
</span><span class="cx"> install(CODE "
</span><del>---- CMakeLists.txt.orig 2015-08-03 13:51:16.000000000 -0400
-+++ CMakeLists.txt 2015-08-03 13:51:26.000000000 -0400
-@@ -566,12 +566,6 @@
</del><ins>+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -565,12 +565,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt4guireleasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt4gui.release.diff (142712 => 142713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt4gui.release.diff 2015-11-20 20:40:27 UTC (rev 142712)
+++ trunk/dports/devel/cmake/files/patch-qt4gui.release.diff 2015-11-20 20:42:01 UTC (rev 142713)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> --- Source/QtDialog/CMakeLists.txt.orig
</span><span class="cx"> +++ Source/QtDialog/CMakeLists.txt
</span><del>-@@ -14,58 +14,6 @@
- if(POLICY CMP0020)
</del><ins>+@@ -15,77 +15,6 @@ if(POLICY CMP0020)
</ins><span class="cx"> cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
</span><span class="cx"> endif()
</span><ins>+ CMake_OPTIONAL_COMPONENT(cmake-gui)
</ins><span class="cx"> -find_package(Qt5Widgets QUIET)
</span><span class="cx"> -if (Qt5Widgets_FOUND)
</span><span class="cx"> - include_directories(${Qt5Widgets_INCLUDE_DIRS})
</span><span class="lines">@@ -25,49 +25,69 @@
</span><span class="cx"> -
</span><span class="cx"> - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
</span><span class="cx"> -
</span><del>-- # We need to install Cocoa platform plugin and add qt.conf for Qt5 on Mac.
</del><ins>+- # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
</ins><span class="cx"> - # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
</span><del>-- # Qt5 Mac support is missing there.
-- if(APPLE)
</del><ins>+- # Qt5 support is missing there.
+- if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</ins><span class="cx"> - macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)
</span><span class="cx"> - get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
</span><span class="cx"> - if(EXISTS "${_qt_plugin_path}")
</span><span class="cx"> - get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
</span><span class="cx"> - get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
</span><span class="cx"> - get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
</span><del>-- set(_qt_plugin_dest "PlugIns/${_qt_plugin_type}")
</del><ins>+- if(APPLE)
+- set(_qt_plugin_dir "PlugIns")
+- elseif(WIN32)
+- set(_qt_plugin_dir "plugins")
+- endif()
+- set(_qt_plugin_dest "${_qt_plugin_dir}/${_qt_plugin_type}")
</ins><span class="cx"> - install(FILES "${_qt_plugin_path}"
</span><del>-- DESTINATION "${_qt_plugin_dest}")
</del><ins>+- DESTINATION "${_qt_plugin_dest}"
+- ${COMPONENT})
</ins><span class="cx"> - set(${_qt_plugins_var}
</span><span class="cx"> - "${${_qt_plugins_var}};\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")
</span><span class="cx"> - else()
</span><span class="cx"> - message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
</span><span class="cx"> - endif()
</span><span class="cx"> - endmacro()
</span><del>-- install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)
-- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
-- "[Paths]\nPlugins = PlugIns\n")
-- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources")
</del><ins>+- if(APPLE)
+- install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)
+- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+- "[Paths]\nPlugins = ${_qt_plugin_dir}\n")
+- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
+- ${COMPONENT})
+- elseif(WIN32)
+- install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)
+- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+- "[Paths]\nPlugins = ../${_qt_plugin_dir}\n")
+- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+- DESTINATION bin
+- ${COMPONENT})
+- endif()
</ins><span class="cx"> - endif()
</span><span class="cx"> -
</span><del>-- if(WIN32 AND TARGET Qt5::Core)
</del><ins>+- if(TARGET Qt5::Core)
</ins><span class="cx"> - get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
</span><span class="cx"> - get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
</span><ins>+- if(APPLE)
+- get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
+- endif()
</ins><span class="cx"> - endif()
</span><span class="cx"> -else()
</span><span class="cx"> set(QT_MIN_VERSION "4.4.0")
</span><span class="cx"> find_package(Qt4 REQUIRED)
</span><span class="cx"> if(NOT QT4_FOUND)
</span><del>-@@ -83,7 +31,6 @@
- set(Qt_BIN_DIR ${_Qt_BIN_DIR})
- endif()
- endif()
</del><ins>+@@ -97,8 +26,6 @@ else()
+
+ set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
+
</ins><span class="cx"> -endif()
</span><del>-
</del><ins>+-
</ins><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><del>-@@ -121,7 +68,7 @@
</del><ins>+ AddCacheEntry.h
+@@ -135,7 +62,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</ins><span class="cx"> if(WIN32)
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.rc)
</span><span class="cx"> endif()
</span><span class="lines">@@ -76,34 +96,33 @@
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.icns)
</span><span class="cx"> set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span class="cx"> set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><del>-@@ -137,13 +84,13 @@
</del><ins>+@@ -152,10 +79,10 @@ endif()
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><del>--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+add_executable(cmake-gui WIN32 ${SRCS})
</del><ins>+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
++add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
</ins><span class="cx"> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
</span><del>- if(Qt_BIN_DIR)
- set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
- endif()
</del><span class="cx">
</span><span class="cx"> -if(APPLE)
</span><span class="cx"> +if(APPLEBUNDLE)
</span><span class="cx"> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span class="cx"> LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span class="cx">
</span><del>-@@ -181,16 +128,16 @@
- install(FILES cmakecache.xml DESTINATION share/mime/packages )
</del><ins>+@@ -200,18 +127,18 @@ if(UNIX AND NOT APPLE)
+ ${COMPONENT})
</ins><span class="cx"> endif()
</span><span class="cx">
</span><span class="cx"> -if(APPLE)
</span><span class="cx"> +if(APPLEBUNDLE)
</span><del>- install(CODE "execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
- WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
</del><ins>+ install(CODE "
+ execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
+ WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
+ " ${COMPONENT})
</ins><span class="cx"> endif()
</span><span class="cx">
</span><del>--if(APPLE OR WIN32)
-+if(APPLEBUNDLE OR WIN32)
</del><ins>+-if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
++if(CMake_INSTALL_DEPENDENCIES AND (APPLEBUNDLE OR WIN32))
</ins><span class="cx"> # install rules for including 3rd party libs such as Qt
</span><span class="cx"> # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
</span><span class="cx"> set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
</span><span class="lines">@@ -114,7 +133,7 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -550,12 +550,6 @@
</del><ins>+@@ -563,12 +563,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt5guideveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff (142712 => 142713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff 2015-11-20 20:40:27 UTC (rev 142712)
+++ trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff 2015-11-20 20:42:01 UTC (rev 142713)
</span><span class="lines">@@ -5,16 +5,16 @@
</span><span class="cx"> CMake_OPTIONAL_COMPONENT(cmake-gui)
</span><span class="cx"> find_package(Qt5Widgets QUIET)
</span><span class="cx"> -if (Qt5Widgets_FOUND)
</span><del>-+if (NOT Qt5Widgets_FOUND)
</del><ins>++if(NOT Qt5Widgets_FOUND)
</ins><span class="cx"> + message(FATAL_ERROR "Qt5 required but not found")
</span><span class="cx"> +endif()
</span><span class="cx"> +
</span><span class="cx"> include_directories(${Qt5Widgets_INCLUDE_DIRS})
</span><span class="cx"> add_definitions(${Qt5Widgets_DEFINITONS})
</span><span class="cx"> macro(qt4_wrap_ui)
</span><del>-@@ -82,25 +85,6 @@
- get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
- get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
</del><ins>+@@ -85,19 +88,6 @@
+ get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
+ endif()
</ins><span class="cx"> endif()
</span><span class="cx"> -else()
</span><span class="cx"> - set(QT_MIN_VERSION "4.4.0")
</span><span class="lines">@@ -28,17 +28,11 @@
</span><span class="cx"> -
</span><span class="cx"> - set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
</span><span class="cx"> -
</span><del>-- if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
-- get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
-- if(EXISTS "${_Qt_BIN_DIR}/QtCore4.dll")
-- set(Qt_BIN_DIR ${_Qt_BIN_DIR})
-- endif()
-- endif()
</del><span class="cx"> -endif()
</span><span class="cx">
</span><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><del>-@@ -138,7 +122,7 @@
</del><ins>+@@ -135,7 +125,7 @@
</ins><span class="cx"> if(WIN32)
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.rc)
</span><span class="cx"> endif()
</span><span class="lines">@@ -47,23 +41,28 @@
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.icns)
</span><span class="cx"> set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span class="cx"> set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><del>-@@ -155,13 +139,13 @@
</del><ins>+@@ -152,10 +142,10 @@
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><del>--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+add_executable(cmake-gui WIN32 ${SRCS})
</del><ins>+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
++add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
</ins><span class="cx"> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
</span><del>- if(Qt_BIN_DIR)
- set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
- endif()
</del><span class="cx">
</span><span class="cx"> -if(APPLE)
</span><span class="cx"> +if(APPLEBUNDLE)
</span><span class="cx"> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span class="cx"> LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span class="cx">
</span><del>-@@ -213,11 +197,11 @@
</del><ins>+@@ -200,18 +190,18 @@
+ ${COMPONENT})
+ endif()
+
+-if(APPLE)
++if(APPLEBUNDLE)
+ install(CODE "
+ execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
+ WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
</ins><span class="cx"> " ${COMPONENT})
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="lines">@@ -79,7 +78,7 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -566,12 +566,6 @@
</del><ins>+@@ -565,12 +565,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt5guireleasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt5gui.release.diff (142712 => 142713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt5gui.release.diff 2015-11-20 20:40:27 UTC (rev 142712)
+++ trunk/dports/devel/cmake/files/patch-qt5gui.release.diff 2015-11-20 20:42:01 UTC (rev 142713)
</span><span class="lines">@@ -1,20 +1,20 @@
</span><span class="cx"> --- Source/QtDialog/CMakeLists.txt.orig
</span><span class="cx"> +++ Source/QtDialog/CMakeLists.txt
</span><del>-@@ -15,7 +15,10 @@
- cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
</del><ins>+@@ -16,7 +16,10 @@
</ins><span class="cx"> endif()
</span><ins>+ CMake_OPTIONAL_COMPONENT(cmake-gui)
</ins><span class="cx"> find_package(Qt5Widgets QUIET)
</span><span class="cx"> -if (Qt5Widgets_FOUND)
</span><del>-+if (NOT Qt5Widgets_FOUND)
</del><ins>++if(NOT Qt5Widgets_FOUND)
</ins><span class="cx"> + message(FATAL_ERROR "Qt5 required but not found")
</span><span class="cx"> +endif()
</span><span class="cx"> +
</span><span class="cx"> include_directories(${Qt5Widgets_INCLUDE_DIRS})
</span><span class="cx"> add_definitions(${Qt5Widgets_DEFINITONS})
</span><span class="cx"> macro(qt4_wrap_ui)
</span><del>-@@ -65,25 +68,6 @@
- get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
- get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
</del><ins>+@@ -85,19 +88,6 @@
+ get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
+ endif()
</ins><span class="cx"> endif()
</span><span class="cx"> -else()
</span><span class="cx"> - set(QT_MIN_VERSION "4.4.0")
</span><span class="lines">@@ -28,17 +28,11 @@
</span><span class="cx"> -
</span><span class="cx"> - set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
</span><span class="cx"> -
</span><del>-- if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
-- get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
-- if(EXISTS "${_Qt_BIN_DIR}/QtCore4.dll")
-- set(Qt_BIN_DIR ${_Qt_BIN_DIR})
-- endif()
-- endif()
</del><span class="cx"> -endif()
</span><span class="cx">
</span><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><del>-@@ -121,7 +105,7 @@
</del><ins>+@@ -135,7 +125,7 @@
</ins><span class="cx"> if(WIN32)
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.rc)
</span><span class="cx"> endif()
</span><span class="lines">@@ -47,34 +41,33 @@
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.icns)
</span><span class="cx"> set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span class="cx"> set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><del>-@@ -137,13 +121,13 @@
</del><ins>+@@ -152,10 +142,10 @@
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><del>--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+add_executable(cmake-gui WIN32 ${SRCS})
</del><ins>+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
++add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
</ins><span class="cx"> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
</span><del>- if(Qt_BIN_DIR)
- set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
- endif()
</del><span class="cx">
</span><span class="cx"> -if(APPLE)
</span><span class="cx"> +if(APPLEBUNDLE)
</span><span class="cx"> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span class="cx"> LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span class="cx">
</span><del>-@@ -181,16 +165,16 @@
- install(FILES cmakecache.xml DESTINATION share/mime/packages )
</del><ins>+@@ -200,18 +190,18 @@
+ ${COMPONENT})
</ins><span class="cx"> endif()
</span><span class="cx">
</span><span class="cx"> -if(APPLE)
</span><span class="cx"> +if(APPLEBUNDLE)
</span><del>- install(CODE "execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
- WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
</del><ins>+ install(CODE "
+ execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
+ WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
+ " ${COMPONENT})
</ins><span class="cx"> endif()
</span><span class="cx">
</span><del>--if(APPLE OR WIN32)
-+if(APPLEBUNDLE OR WIN32)
</del><ins>+-if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
++if(CMake_INSTALL_DEPENDENCIES AND (APPLEBUNDLE OR WIN32))
</ins><span class="cx"> # install rules for including 3rd party libs such as Qt
</span><span class="cx"> # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
</span><span class="cx"> set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
</span><span class="lines">@@ -85,7 +78,7 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -550,12 +550,6 @@
</del><ins>+@@ -563,12 +563,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre>
</div>
</div>
</body>
</html>