[139134] trunk/dports/devel/cmake
michaelld at macports.org
michaelld at macports.org
Mon Aug 3 11:41:43 PDT 2015
Revision: 139134
https://trac.macports.org/changeset/139134
Author: michaelld at macports.org
Date: 2015-08-03 11:41:43 -0700 (Mon, 03 Aug 2015)
Log Message:
-----------
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].
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff
trunk/dports/devel/cmake/files/patch-qt4gui.release.diff
Added Paths:
-----------
trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff
trunk/dports/devel/cmake/files/patch-qt5gui.release.diff
Removed Paths:
-------------
trunk/dports/devel/cmake/files/patch-qt5gui.diff
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- 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)
@@ -23,15 +23,15 @@
subport cmake-devel {}
-set branch 3.2
+set branch 3.3
if {${subport} eq ${name}} {
# release
- version ${branch}.3
- checksums rmd160 7cd30ba8d58d1d312fb59f6f02c34d3842123fab \
- sha256 a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297
+ version ${branch}.0
+ checksums rmd160 90a0a92bf8b1fb216023d69d3c3ad8cd3feb2dc9 \
+ sha256 857c2f755fe0794d038d6fa462a173d05b210ac2c07ff82f0af853acef231a34
long_description ${base_long_description} \
The ${subport} release port is updated roughly every few months.
@@ -47,12 +47,12 @@
} else {
# devel
- version 20150721
+ version 20150803
set dist_branch 3.3
- set dist_date 20150720
- set dist_hash g350e3b
- checksums rmd160 f611b361ee239486f759ea8608a4408bc8935db8 \
- sha256 7c2cae537a225cc80e90ed4a07675aab233b5efe7a2a5677591133e37493f699
+ set dist_date 20150731
+ set dist_hash g96736
+ checksums rmd160 9e70e4106abdf89bfb60fe77ad724339bb07042e \
+ sha256 220fc3e70de655789f8628bc27de8fb3731b2588fa392f8a52fa7af10797ea7f
master_sites http://www.cmake.org/files/dev/
distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
@@ -225,7 +225,11 @@
variant qt5 conflicts qt4 requires gui description {Build Qt GUI using Qt5} {
PortGroup qt5 1.0
- patchfiles-append patch-qt5gui.diff
+ if {${subport} eq ${name}} {
+ patchfiles-append patch-qt5gui.release.diff
+ } else {
+ patchfiles-append patch-qt5gui.devel.diff
+ }
configure.args-append --qt-qmake=${qt_qmake_cmd}
}
Modified: trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
--- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
-@@ -15,60 +15,6 @@
+@@ -15,74 +15,6 @@
cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
@@ -25,17 +25,22 @@
-
- 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}"
- ${COMPONENT})
@@ -45,12 +50,21 @@
- 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"
-- ${COMPONENT})
+- 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)
@@ -61,7 +75,7 @@
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
-@@ -86,7 +32,6 @@
+@@ -100,7 +32,6 @@
set(Qt_BIN_DIR ${_Qt_BIN_DIR})
endif()
endif()
@@ -69,7 +83,7 @@
set(SRCS
AddCacheEntry.cxx
-@@ -124,7 +69,7 @@
+@@ -138,7 +69,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -78,7 +92,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -141,13 +86,13 @@
+@@ -155,13 +86,13 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -94,7 +108,7 @@
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
-@@ -192,18 +137,18 @@
+@@ -206,18 +137,18 @@
${COMPONENT})
endif()
@@ -106,8 +120,8 @@
" ${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}")
@@ -116,9 +130,9 @@
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
endif()
install(CODE "
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -561,12 +561,6 @@
+--- 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 @@
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-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)
@@ -1,6 +1,6 @@
--- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
-@@ -14,58 +14,6 @@ project(QtDialog)
+@@ -14,58 +14,6 @@
if(POLICY CMP0020)
cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
@@ -35,11 +35,11 @@
- 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 "${CMAKE_INSTALL_PREFIX}/PlugIns/${_qt_plugin_type}")
+- set(_qt_plugin_dest "PlugIns/${_qt_plugin_type}")
- install(FILES "${_qt_plugin_path}"
- DESTINATION "${_qt_plugin_dest}")
- set(${_qt_plugins_var}
-- "${${_qt_plugins_var}};${_qt_plugin_dest}/${_qt_plugin_file}")
+- "${${_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()
@@ -59,7 +59,7 @@
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
-@@ -83,7 +31,6 @@ else()
+@@ -83,7 +31,6 @@
set(Qt_BIN_DIR ${_Qt_BIN_DIR})
endif()
endif()
@@ -67,7 +67,7 @@
set(SRCS
AddCacheEntry.cxx
-@@ -125,7 +72,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
+@@ -121,7 +68,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -76,7 +76,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -141,13 +88,13 @@ endif()
+@@ -137,13 +84,13 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -92,7 +92,7 @@
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 @@ if(UNIX)
+@@ -181,16 +128,16 @@
install(FILES cmakecache.xml DESTINATION share/mime/packages )
endif()
@@ -114,15 +114,12 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -505,15 +505,6 @@
+@@ -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 /
-- string(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN)
-- math(EXPR LEN "${LEN} -1" )
-- string(SUBSTRING "${CMAKE_INSTALL_PREFIX}" ${LEN} 1 ENDCH)
-- if(NOT "${ENDCH}" STREQUAL "/")
+- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
- endif()
- set(CMAKE_INSTALL_PREFIX
Copied: trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff (from rev 139121, trunk/dports/devel/cmake/files/patch-qt5gui.diff)
===================================================================
--- 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)
@@ -0,0 +1,94 @@
+--- 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)
Deleted: trunk/dports/devel/cmake/files/patch-qt5gui.diff
===================================================================
--- 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)
@@ -1,103 +0,0 @@
---- 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)
Copied: trunk/dports/devel/cmake/files/patch-qt5gui.release.diff (from rev 139121, trunk/dports/devel/cmake/files/patch-qt5gui.diff)
===================================================================
--- 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)
@@ -0,0 +1,100 @@
+--- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150803/630df15a/attachment.html>
More information about the macports-changes
mailing list