[142713] trunk/dports/devel/cmake/files
michaelld at macports.org
michaelld at macports.org
Sat Dec 12 06:55:18 PST 2015
Revision: 142713
https://trac.macports.org/changeset/142713
Author: michaelld at macports.org
Date: 2015-11-20 12:42:01 -0800 (Fri, 20 Nov 2015)
Log Message:
-----------
cmake*: update Qt4/5 GUI patches; addresses ticket #49685.
Modified Paths:
--------------
trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff
trunk/dports/devel/cmake/files/patch-qt4gui.release.diff
trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff
trunk/dports/devel/cmake/files/patch-qt5gui.release.diff
Modified: trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
--- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
-@@ -15,74 +15,6 @@
+@@ -15,77 +15,6 @@ if(POLICY CMP0020)
cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
@@ -67,23 +67,27 @@
- endif()
- endif()
-
-- if(WIN32 AND TARGET Qt5::Core)
+- if(TARGET Qt5::Core)
- get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
- get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
+- if(APPLE)
+- get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
+- endif()
- endif()
-else()
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
-@@ -100,7 +32,6 @@
- set(Qt_BIN_DIR ${_Qt_BIN_DIR})
- endif()
- endif()
+@@ -97,8 +26,6 @@ else()
+
+ set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
+
-endif()
-
+-
set(SRCS
AddCacheEntry.cxx
-@@ -138,7 +69,7 @@
+ AddCacheEntry.h
+@@ -135,7 +62,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -92,23 +96,20 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -155,13 +86,13 @@
+@@ -152,10 +79,10 @@ endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+add_executable(cmake-gui WIN32 ${SRCS})
+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
++add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
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")
-@@ -206,18 +137,18 @@
+@@ -200,18 +127,18 @@ if(UNIX AND NOT APPLE)
${COMPONENT})
endif()
@@ -130,9 +131,9 @@
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
endif()
install(CODE "
---- 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 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -565,12 +565,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
Modified: trunk/dports/devel/cmake/files/patch-qt4gui.release.diff
===================================================================
--- 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)
@@ -1,9 +1,9 @@
--- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
-@@ -14,58 +14,6 @@
- if(POLICY CMP0020)
+@@ -15,77 +15,6 @@ if(POLICY CMP0020)
cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
+ CMake_OPTIONAL_COMPONENT(cmake-gui)
-find_package(Qt5Widgets QUIET)
-if (Qt5Widgets_FOUND)
- include_directories(${Qt5Widgets_INCLUDE_DIRS})
@@ -25,49 +25,69 @@
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-
-- # We need to install Cocoa platform plugin and add qt.conf for Qt5 on Mac.
+- # 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 Mac support is missing there.
-- if(APPLE)
+- # Qt5 support is missing there.
+- if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
- macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)
- get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
- if(EXISTS "${_qt_plugin_path}")
- get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
- get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
- get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
-- set(_qt_plugin_dest "PlugIns/${_qt_plugin_type}")
+- 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}")
- install(FILES "${_qt_plugin_path}"
-- DESTINATION "${_qt_plugin_dest}")
+- DESTINATION "${_qt_plugin_dest}"
+- ${COMPONENT})
- set(${_qt_plugins_var}
- "${${_qt_plugins_var}};\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")
- else()
- message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
- endif()
- endmacro()
-- 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")
+- 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()
- endif()
-
-- if(WIN32 AND TARGET Qt5::Core)
+- if(TARGET Qt5::Core)
- get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
- get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
+- if(APPLE)
+- get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
+- endif()
- endif()
-else()
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
-@@ -83,7 +31,6 @@
- set(Qt_BIN_DIR ${_Qt_BIN_DIR})
- endif()
- endif()
+@@ -97,8 +26,6 @@ else()
+
+ set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
+
-endif()
-
+-
set(SRCS
AddCacheEntry.cxx
-@@ -121,7 +68,7 @@
+ AddCacheEntry.h
+@@ -135,7 +62,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -76,34 +96,33 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -137,13 +84,13 @@
+@@ -152,10 +79,10 @@ endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+add_executable(cmake-gui WIN32 ${SRCS})
+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
++add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
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 +128,16 @@
- install(FILES cmakecache.xml DESTINATION share/mime/packages )
+@@ -200,18 +127,18 @@ if(UNIX AND NOT APPLE)
+ ${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)")
+ install(CODE "
+ execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
+ WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
+ " ${COMPONENT})
endif()
--if(APPLE OR WIN32)
-+if(APPLEBUNDLE OR WIN32)
+-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}")
@@ -114,7 +133,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -550,12 +550,6 @@
+@@ -563,12 +563,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
Modified: trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff
===================================================================
--- 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)
@@ -5,16 +5,16 @@
CMake_OPTIONAL_COMPONENT(cmake-gui)
find_package(Qt5Widgets QUIET)
-if (Qt5Widgets_FOUND)
-+if (NOT 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)
+@@ -85,19 +88,6 @@
+ get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
+ endif()
endif()
-else()
- set(QT_MIN_VERSION "4.4.0")
@@ -28,17 +28,11 @@
-
- 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 @@
+@@ -135,7 +125,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -47,23 +41,28 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -155,13 +139,13 @@
+@@ -152,10 +142,10 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+add_executable(cmake-gui WIN32 ${SRCS})
+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
++add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
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 @@
+@@ -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)
" ${COMPONENT})
endif()
@@ -79,7 +78,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -566,12 +566,6 @@
+@@ -565,12 +565,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
Modified: trunk/dports/devel/cmake/files/patch-qt5gui.release.diff
===================================================================
--- 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)
@@ -1,20 +1,20 @@
--- 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
+@@ -16,7 +16,10 @@
endif()
+ CMake_OPTIONAL_COMPONENT(cmake-gui)
find_package(Qt5Widgets QUIET)
-if (Qt5Widgets_FOUND)
-+if (NOT 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)
+@@ -85,19 +88,6 @@
+ get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
+ endif()
endif()
-else()
- set(QT_MIN_VERSION "4.4.0")
@@ -28,17 +28,11 @@
-
- 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 @@
+@@ -135,7 +125,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -47,34 +41,33 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -137,13 +121,13 @@
+@@ -152,10 +142,10 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-+add_executable(cmake-gui WIN32 ${SRCS})
+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
++add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
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 )
+@@ -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)")
+ install(CODE "
+ execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
+ WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
+ " ${COMPONENT})
endif()
--if(APPLE OR WIN32)
-+if(APPLEBUNDLE OR WIN32)
+-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}")
@@ -85,7 +78,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -550,12 +550,6 @@
+@@ -563,12 +563,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/1e896db1/attachment-0001.html>
More information about the macports-changes
mailing list