<!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>[139134] trunk/dports/devel/cmake</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/139134">139134</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-08-03 11:41:43 -0700 (Mon, 03 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cmake:
+ update release to 3.3.0;
+ update devel to 20150731 (g96736);
+ fix Qt patchfiles depending on Qt version [4,5] and port [devel,release].</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakePortfile">trunk/dports/devel/cmake/Portfile</a></li>
<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>
</ul>
<h3>Added Paths</h3>
<ul>
<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>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakefilespatchqt5guidiff">trunk/dports/devel/cmake/files/patch-qt5gui.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcmakePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/Portfile (139133 => 139134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/Portfile 2015-08-03 18:36:22 UTC (rev 139133)
+++ trunk/dports/devel/cmake/Portfile 2015-08-03 18:41:43 UTC (rev 139134)
</span><span class="lines">@@ -23,15 +23,15 @@
</span><span class="cx">
</span><span class="cx"> subport cmake-devel {}
</span><span class="cx">
</span><del>-set branch 3.2
</del><ins>+set branch 3.3
</ins><span class="cx">
</span><span class="cx"> if {${subport} eq ${name}} {
</span><span class="cx">
</span><span class="cx"> # release
</span><span class="cx">
</span><del>- version ${branch}.3
- checksums rmd160 7cd30ba8d58d1d312fb59f6f02c34d3842123fab \
- sha256 a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297
</del><ins>+ version ${branch}.0
+ checksums rmd160 90a0a92bf8b1fb216023d69d3c3ad8cd3feb2dc9 \
+ sha256 857c2f755fe0794d038d6fa462a173d05b210ac2c07ff82f0af853acef231a34
</ins><span class="cx">
</span><span class="cx"> long_description ${base_long_description} \
</span><span class="cx"> The ${subport} release port is updated roughly every few months.
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> # devel
</span><del>- version 20150721
</del><ins>+ version 20150803
</ins><span class="cx"> set dist_branch 3.3
</span><del>- set dist_date 20150720
- set dist_hash g350e3b
- checksums rmd160 f611b361ee239486f759ea8608a4408bc8935db8 \
- sha256 7c2cae537a225cc80e90ed4a07675aab233b5efe7a2a5677591133e37493f699
</del><ins>+ set dist_date 20150731
+ set dist_hash g96736
+ checksums rmd160 9e70e4106abdf89bfb60fe77ad724339bb07042e \
+ sha256 220fc3e70de655789f8628bc27de8fb3731b2588fa392f8a52fa7af10797ea7f
</ins><span class="cx">
</span><span class="cx"> master_sites http://www.cmake.org/files/dev/
</span><span class="cx"> distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
</span><span class="lines">@@ -225,7 +225,11 @@
</span><span class="cx">
</span><span class="cx"> variant qt5 conflicts qt4 requires gui description {Build Qt GUI using Qt5} {
</span><span class="cx"> PortGroup qt5 1.0
</span><del>- patchfiles-append patch-qt5gui.diff
</del><ins>+ if {${subport} eq ${name}} {
+ patchfiles-append patch-qt5gui.release.diff
+ } else {
+ patchfiles-append patch-qt5gui.devel.diff
+ }
</ins><span class="cx"> configure.args-append --qt-qmake=${qt_qmake_cmd}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt4guideveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff (139133 => 139134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff 2015-08-03 18:36:22 UTC (rev 139133)
+++ trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff 2015-08-03 18:41:43 UTC (rev 139134)
</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,60 +15,6 @@
</del><ins>+@@ -15,74 +15,6 @@
</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">@@ -25,17 +25,22 @@
</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><span class="cx"> - DESTINATION "${_qt_plugin_dest}"
</span><span class="cx"> - ${COMPONENT})
</span><span class="lines">@@ -45,12 +50,21 @@
</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"
-- ${COMPONENT})
</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><span class="cx"> - if(WIN32 AND TARGET Qt5::Core)
</span><span class="lines">@@ -61,7 +75,7 @@
</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>-@@ -86,7 +32,6 @@
</del><ins>+@@ -100,7 +32,6 @@
</ins><span class="cx"> set(Qt_BIN_DIR ${_Qt_BIN_DIR})
</span><span class="cx"> endif()
</span><span class="cx"> endif()
</span><span class="lines">@@ -69,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><del>-@@ -124,7 +69,7 @@
</del><ins>+@@ -138,7 +69,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">@@ -78,7 +92,7 @@
</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>-@@ -141,13 +86,13 @@
</del><ins>+@@ -155,13 +86,13 @@
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><span class="lines">@@ -94,7 +108,7 @@
</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>-@@ -192,18 +137,18 @@
</del><ins>+@@ -206,18 +137,18 @@
</ins><span class="cx"> ${COMPONENT})
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="lines">@@ -106,8 +120,8 @@
</span><span class="cx"> " ${COMPONENT})
</span><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">@@ -116,9 +130,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
-+++ CMakeLists.txt
-@@ -561,12 +561,6 @@
</del><ins>+--- 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 @@
</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 (139133 => 139134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt4gui.release.diff 2015-08-03 18:36:22 UTC (rev 139133)
+++ trunk/dports/devel/cmake/files/patch-qt4gui.release.diff 2015-08-03 18:41:43 UTC (rev 139134)
</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>-@@ -14,58 +14,6 @@ project(QtDialog)
</del><ins>+@@ -14,58 +14,6 @@
</ins><span class="cx"> if(POLICY CMP0020)
</span><span class="cx"> cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
</span><span class="cx"> endif()
</span><span class="lines">@@ -35,11 +35,11 @@
</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 "${CMAKE_INSTALL_PREFIX}/PlugIns/${_qt_plugin_type}")
</del><ins>+- set(_qt_plugin_dest "PlugIns/${_qt_plugin_type}")
</ins><span class="cx"> - install(FILES "${_qt_plugin_path}"
</span><span class="cx"> - DESTINATION "${_qt_plugin_dest}")
</span><span class="cx"> - set(${_qt_plugins_var}
</span><del>-- "${${_qt_plugins_var}};${_qt_plugin_dest}/${_qt_plugin_file}")
</del><ins>+- "${${_qt_plugins_var}};\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")
</ins><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="lines">@@ -59,7 +59,7 @@
</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 @@ else()
</del><ins>+@@ -83,7 +31,6 @@
</ins><span class="cx"> set(Qt_BIN_DIR ${_Qt_BIN_DIR})
</span><span class="cx"> endif()
</span><span class="cx"> endif()
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><del>-@@ -125,7 +72,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</del><ins>+@@ -121,7 +68,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">@@ -76,7 +76,7 @@
</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>-@@ -141,13 +88,13 @@ endif()
</del><ins>+@@ -137,13 +84,13 @@
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</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>-@@ -179,16 +126,16 @@ if(UNIX)
</del><ins>+@@ -181,16 +128,16 @@
</ins><span class="cx"> install(FILES cmakecache.xml DESTINATION share/mime/packages )
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="lines">@@ -114,15 +114,12 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -505,15 +505,6 @@
</del><ins>+@@ -550,12 +550,6 @@
</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 class="cx"> - # make sure CMAKE_INSTALL_PREFIX ends in /
</span><del>-- string(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN)
-- math(EXPR LEN "${LEN} -1" )
-- string(SUBSTRING "${CMAKE_INSTALL_PREFIX}" ${LEN} 1 ENDCH)
-- if(NOT "${ENDCH}" STREQUAL "/")
</del><ins>+- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
</ins><span class="cx"> - set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
</span><span class="cx"> - endif()
</span><span class="cx"> - set(CMAKE_INSTALL_PREFIX
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt5guideveldifffromrev139121trunkdportsdevelcmakefilespatchqt5guidiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff (from rev 139121, trunk/dports/devel/cmake/files/patch-qt5gui.diff) (0 => 139134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff 2015-08-03 18:41:43 UTC (rev 139134)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+--- Source/QtDialog/CMakeLists.txt.orig
++++ Source/QtDialog/CMakeLists.txt
+@@ -16,7 +16,10 @@
+ endif()
+ CMake_OPTIONAL_COMPONENT(cmake-gui)
+ find_package(Qt5Widgets QUIET)
+-if (Qt5Widgets_FOUND)
++if (NOT Qt5Widgets_FOUND)
++ message(FATAL_ERROR "Qt5 required but not found")
++endif()
++
+ include_directories(${Qt5Widgets_INCLUDE_DIRS})
+ add_definitions(${Qt5Widgets_DEFINITONS})
+ macro(qt4_wrap_ui)
+@@ -82,25 +85,6 @@
+ get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
+ get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
+ endif()
+-else()
+- set(QT_MIN_VERSION "4.4.0")
+- find_package(Qt4 REQUIRED)
+- if(NOT QT4_FOUND)
+- message(SEND_ERROR "Failed to find Qt 4.4 or greater.")
+- return()
+- endif()
+-
+- include(${QT_USE_FILE})
+-
+- set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
+-
+- 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()
+-endif()
+
+ set(SRCS
+ AddCacheEntry.cxx
+@@ -138,7 +122,7 @@
+ if(WIN32)
+ set(SRCS ${SRCS} CMakeSetup.rc)
+ endif()
+-if(APPLE)
++if(APPLEBUNDLE)
+ set(SRCS ${SRCS} CMakeSetup.icns)
+ set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
+ set_source_files_properties(CMakeSetup.icns PROPERTIES
+@@ -155,13 +139,13 @@
+
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
++add_executable(cmake-gui WIN32 ${SRCS})
+ target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
+ if(Qt_BIN_DIR)
+ set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
+ endif()
+
+-if(APPLE)
++if(APPLEBUNDLE)
+ file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
+ LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
+
+@@ -213,11 +197,11 @@
+ " ${COMPONENT})
+ endif()
+
+-if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
++if(CMake_INSTALL_DEPENDENCIES AND (APPLEBUNDLE OR WIN32))
+ # 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}")
+- if(APPLE)
++ if(APPLEBUNDLE)
+ set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
+ endif()
+ install(CODE "
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -566,12 +566,6 @@
+ set(CMAKE_BUNDLE_VERSION
+ "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
+ set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
+- # make sure CMAKE_INSTALL_PREFIX ends in /
+- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
+- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
+- endif()
+- set(CMAKE_INSTALL_PREFIX
+- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
+ endif()
+
+ set(QT_NEED_RPATH FALSE)
</ins></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt5guidiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/cmake/files/patch-qt5gui.diff (139133 => 139134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt5gui.diff 2015-08-03 18:36:22 UTC (rev 139133)
+++ trunk/dports/devel/cmake/files/patch-qt5gui.diff 2015-08-03 18:41:43 UTC (rev 139134)
</span><span class="lines">@@ -1,103 +0,0 @@
</span><del>---- Source/QtDialog/CMakeLists.txt.orig
-+++ Source/QtDialog/CMakeLists.txt
-@@ -15,7 +15,10 @@ if(POLICY CMP0020)
- cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
- endif()
- find_package(Qt5Widgets QUIET)
--if (Qt5Widgets_FOUND)
-+if (NOT Qt5Widgets_FOUND)
-+ message(FATAL_ERROR "Qt5 required but not found")
-+endif()
-+
- include_directories(${Qt5Widgets_INCLUDE_DIRS})
- add_definitions(${Qt5Widgets_DEFINITONS})
- macro(qt4_wrap_ui)
-@@ -65,25 +68,6 @@ if (Qt5Widgets_FOUND)
- get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
- get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
- endif()
--else()
-- set(QT_MIN_VERSION "4.4.0")
-- find_package(Qt4 REQUIRED)
-- if(NOT QT4_FOUND)
-- message(SEND_ERROR "Failed to find Qt 4.4 or greater.")
-- return()
-- endif()
--
-- include(${QT_USE_FILE})
--
-- set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
--
-- 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()
--endif()
-
- set(SRCS
- AddCacheEntry.cxx
-@@ -125,7 +72,7 @@
- if(WIN32)
- set(SRCS ${SRCS} CMakeSetup.rc)
- endif()
--if(APPLE)
-+if(APPLEBUNDLE)
- set(SRCS ${SRCS} CMakeSetup.icns)
- set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
- set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -141,13 +88,13 @@ endif()
-
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+add_executable(cmake-gui WIN32 ${SRCS})
- target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
- if(Qt_BIN_DIR)
- set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
- endif()
-
--if(APPLE)
-+if(APPLEBUNDLE)
- file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
- LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
-
-@@ -179,16 +126,16 @@
- install(FILES cmakecache.xml DESTINATION share/mime/packages )
- endif()
-
--if(APPLE)
-+if(APPLEBUNDLE)
- install(CODE "execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
- WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
- endif()
-
--if(APPLE OR WIN32)
-+if(APPLEBUNDLE OR WIN32)
- # 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}")
-- if(APPLE)
-+ if(APPLEBUNDLE)
- set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
- endif()
- install(CODE "
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -505,15 +505,6 @@
- set(CMAKE_BUNDLE_VERSION
- "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
- set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-- # make sure CMAKE_INSTALL_PREFIX ends in /
-- string(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN)
-- math(EXPR LEN "${LEN} -1" )
-- string(SUBSTRING "${CMAKE_INSTALL_PREFIX}" ${LEN} 1 ENDCH)
-- if(NOT "${ENDCH}" STREQUAL "/")
-- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
-- endif()
-- set(CMAKE_INSTALL_PREFIX
-- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
- endif()
-
- set(QT_NEED_RPATH FALSE)
</del></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt5guireleasedifffromrev139121trunkdportsdevelcmakefilespatchqt5guidiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/cmake/files/patch-qt5gui.release.diff (from rev 139121, trunk/dports/devel/cmake/files/patch-qt5gui.diff) (0 => 139134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt5gui.release.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-qt5gui.release.diff 2015-08-03 18:41:43 UTC (rev 139134)
</span><span class="lines">@@ -0,0 +1,100 @@
</span><ins>+--- Source/QtDialog/CMakeLists.txt.orig
++++ Source/QtDialog/CMakeLists.txt
+@@ -15,7 +15,10 @@
+ cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
+ endif()
+ find_package(Qt5Widgets QUIET)
+-if (Qt5Widgets_FOUND)
++if (NOT Qt5Widgets_FOUND)
++ message(FATAL_ERROR "Qt5 required but not found")
++endif()
++
+ include_directories(${Qt5Widgets_INCLUDE_DIRS})
+ add_definitions(${Qt5Widgets_DEFINITONS})
+ macro(qt4_wrap_ui)
+@@ -65,25 +68,6 @@
+ get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
+ get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
+ endif()
+-else()
+- set(QT_MIN_VERSION "4.4.0")
+- find_package(Qt4 REQUIRED)
+- if(NOT QT4_FOUND)
+- message(SEND_ERROR "Failed to find Qt 4.4 or greater.")
+- return()
+- endif()
+-
+- include(${QT_USE_FILE})
+-
+- set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
+-
+- 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()
+-endif()
+
+ set(SRCS
+ AddCacheEntry.cxx
+@@ -121,7 +105,7 @@
+ if(WIN32)
+ set(SRCS ${SRCS} CMakeSetup.rc)
+ endif()
+-if(APPLE)
++if(APPLEBUNDLE)
+ set(SRCS ${SRCS} CMakeSetup.icns)
+ set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
+ set_source_files_properties(CMakeSetup.icns PROPERTIES
+@@ -137,13 +121,13 @@
+
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
++add_executable(cmake-gui WIN32 ${SRCS})
+ target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
+ if(Qt_BIN_DIR)
+ set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
+ endif()
+
+-if(APPLE)
++if(APPLEBUNDLE)
+ file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
+ LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
+
+@@ -181,16 +165,16 @@
+ install(FILES cmakecache.xml DESTINATION share/mime/packages )
+ endif()
+
+-if(APPLE)
++if(APPLEBUNDLE)
+ install(CODE "execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
+ WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
+ endif()
+
+-if(APPLE OR WIN32)
++if(APPLEBUNDLE OR WIN32)
+ # 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}")
+- if(APPLE)
++ if(APPLEBUNDLE)
+ set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
+ endif()
+ install(CODE "
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -550,12 +550,6 @@
+ set(CMAKE_BUNDLE_VERSION
+ "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
+ set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
+- # make sure CMAKE_INSTALL_PREFIX ends in /
+- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
+- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
+- endif()
+- set(CMAKE_INSTALL_PREFIX
+- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
+ endif()
+
+ set(QT_NEED_RPATH FALSE)
</ins></span></pre>
</div>
</div>
</body>
</html>