From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6BBF6198005 for ; Mon, 11 Mar 2013 17:27:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09731E07C0; Mon, 11 Mar 2013 17:27:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E948E07C0 for ; Mon, 11 Mar 2013 17:27:50 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3054D33BF5F for ; Mon, 11 Mar 2013 17:27:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B75B7E4079 for ; Mon, 11 Mar 2013 17:27:47 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1363022788.5e0bf63b4c6db966f11c558f724b180e8f162e70.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.10.2-r2.ebuild dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch dev-util/cmake/files/cmake-2.8.1-libform.patch dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch dev-util/cmake/files/cmake-2.8.10-tests.patch dev-util/cmake/files/cmake-2.8.10.2-qt5.patch dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch dev-util/cmake/files/cmake-2.8.8-tests.patch dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch dev-util/cmake/metadata.xml X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 5e0bf63b4c6db966f11c558f724b180e8f162e70 X-VCS-Branch: master Date: Mon, 11 Mar 2013 17:27:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 436b2e2e-e045-4ee4-bd4a-594c0255f68e X-Archives-Hash: 73f034f90e5cb6689ecd818bf1129977 commit: 5e0bf63b4c6db966f11c558f724b180e8f162e70 Author: Michael Palimaka gentoo org> AuthorDate: Mon Mar 11 17:26:28 2013 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Mar 11 17:26:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5e0bf63b [dev-util/cmake] Add support for Qt5. Package-Manager: portage-2.1.11.55 --- dev-util/cmake/cmake-2.8.10.2-r2.ebuild | 18 +++- .../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 ---- dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 -------- .../cmake/files/cmake-2.8.10-FindPythonLibs.patch | 13 -- dev-util/cmake/files/cmake-2.8.10-tests.patch | 83 ------------ dev-util/cmake/files/cmake-2.8.10.2-qt5.patch | 16 --- .../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 -- dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 --------- .../files/cmake-2.8.9-more-no_host_paths.patch | 133 -------------------- dev-util/cmake/metadata.xml | 3 + 10 files changed, 18 insertions(+), 391 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild index 1ff4336..8c5612f 100644 --- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild +++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild @@ -14,7 +14,9 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar LICENSE="CMake" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" SLOT="0" -IUSE="emacs ncurses qt4 vim-syntax" +IUSE="emacs ncurses +qt4 qt5 vim-syntax" + +REQUIRED_USE="?? ( qt4 qt5 )" DEPEND=" >=app-arch/libarchive-2.8.0:= @@ -27,6 +29,11 @@ DEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) " RDEPEND="${DEPEND} emacs? ( virtual/emacs ) @@ -58,7 +65,6 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch "${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch - "${FILESDIR}"/${PN}-2.8.10.2-qt5.patch ) cmake_src_bootstrap() { @@ -139,8 +145,14 @@ src_configure() { -DCMAKE_MAN_DIR=/share/man -DCMAKE_DATA_DIR=/share/${PN} $(cmake-utils_use_build ncurses CursesDialog) - $(cmake-utils_use_build qt4 QtDialog) ) + + if use qt4 || use qt5 ; then + mycmakeargs+=( + -DBUILD_QtDialog=ON + $(cmake-utils_use_find_package qt5 Qt5Widgets) + ) + fi cmake-utils_src_configure } diff --git a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch deleted file mode 100644 index 6ee9b70..0000000 --- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch +++ /dev/null @@ -1,23 +0,0 @@ -Don't use .so for modules on darwin/macos. Use .bundle instead. -Patch by Heiko Przybyl - ---- Modules/Platform/Darwin.cmake -+++ Modules/Platform/Darwin.cmake -@@ -23,7 +23,7 @@ - SET(CMAKE_SHARED_LIBRARY_PREFIX "lib") - SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") - SET(CMAKE_SHARED_MODULE_PREFIX "lib") --SET(CMAKE_SHARED_MODULE_SUFFIX ".so") -+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle") - SET(CMAKE_MODULE_EXISTS 1) - SET(CMAKE_DL_LIBS "") - -@@ -45,7 +45,7 @@ - SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names") - SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") - SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") --SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") -+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") - - # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree - # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache diff --git a/dev-util/cmake/files/cmake-2.8.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch deleted file mode 100644 index 87c7247..0000000 --- a/dev-util/cmake/files/cmake-2.8.1-libform.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt ---- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100 -+++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200 -@@ -314,9 +314,6 @@ - ELSE (UNIX) - SET(BUILD_CursesDialog 0) - ENDIF (UNIX) -- IF(BUILD_CursesDialog) -- ADD_SUBDIRECTORY(Source/CursesDialog/form) -- ENDIF(BUILD_CursesDialog) - ENDMACRO (CMAKE_BUILD_UTILITIES) - - -diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt ---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100 -+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200 -@@ -25,13 +25,18 @@ - CursesDialog/ccmake - ) - --INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form -- ${CMake_BINARY_DIR}/Source/CursesDialog/form) - INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) - - - ADD_EXECUTABLE(ccmake ${CURSES_SRCS} ) - TARGET_LINK_LIBRARIES(ccmake CMakeLib) --TARGET_LINK_LIBRARIES(ccmake cmForm) -+TARGET_LINK_LIBRARIES(ccmake form) -+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) -+IF(CURSES_EXTRA_LIBRARY) -+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) -+ENDIF(CURSES_EXTRA_LIBRARY) -+ - - INSTALL_TARGETS(/bin ccmake) -+ -+ -diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h ---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100 -+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200 -@@ -15,8 +15,6 @@ - #define _MSE_INT_H - #endif - --#include -- - #if defined(__hpux) - # define _BOOL_DEFINED - # include diff --git a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch deleted file mode 100644 index d4f18ff..0000000 --- a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake -index 0a9a990..6a13d22 100644 ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS) - unset(_PYTHON2_VERSIONS) - unset(_PYTHON3_VERSIONS) - -+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" -+ OUTPUT_VARIABLE _Python_VERSIONS) - foreach(_CURRENT_VERSION ${_Python_VERSIONS}) - string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - if(WIN32) diff --git a/dev-util/cmake/files/cmake-2.8.10-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch deleted file mode 100644 index 944e3c5..0000000 --- a/dev-util/cmake/files/cmake-2.8.10-tests.patch +++ /dev/null @@ -1,83 +0,0 @@ -Removes the following tests: - -- DeployQt4, which tries to break sandbox and ignores prefix -- CTest.updatecvs, which fails to commit as root -- TestUpload, which requires network access - -diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index b404333..50f4292 100644 ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -271,23 +271,6 @@ if(BUILD_TESTING) - ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities") - -- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities) -- # this test also depends on the existence of the standard qtiff plugin -- if(QT4_WORKS AND QT_QTSQL_FOUND) -- add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND} -- --build-and-test -- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy" -- "${CMake_BINARY_DIR}/Tests/Qt4Deploy" -- --build-generator ${CMAKE_TEST_GENERATOR} -- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} -- --build-project Qt4Deploy -- --build-options -- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -- ) -- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy") -- endif() -- - endif() - endif() - -@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}") - endif() - -- # Test CTest Update with CVS -- if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) -- find_package(CVS QUIET) -- else() -- find_program(CVS_EXECUTABLE NAMES cvs) -- set(CVS_FOUND ${CVS_EXECUTABLE}) -- endif() -- set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND}) -- if(CTEST_TEST_UPDATE_CVS AND NOT UNIX) -- if("${CVS_EXECUTABLE}" MATCHES "cygwin") -- message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!") -- set(CTEST_TEST_UPDATE_CVS 0) -- endif() -- endif() -- if(CTEST_TEST_UPDATE_CVS) -- set(CTestUpdateCVS_DIR "CTest UpdateCVS") -- configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY) -- add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND} -- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" -- ) -- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}") -- endif() -- - # Test CTest Update with BZR - find_program(BZR_EXECUTABLE NAMES bzr) - mark_as_advanced(BZR_EXECUTABLE) -@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ - FAIL_REGULAR_EXPRESSION "SegFault") - - configure_file( -- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -- @ONLY ESCAPE_QUOTES) -- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND} -- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V -- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log" -- ) -- set_tests_properties(CTestTestUpload PROPERTIES -- PASS_REGULAR_EXPRESSION "Upload\\.xml") -- -- configure_file( - "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in" - "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake" - @ONLY ESCAPE_QUOTES) diff --git a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch deleted file mode 100644 index 1f2bef0..0000000 --- a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- Source/QtDoalog/CMakeLists.txt -+++ Source/QtDialog/CMakeLists.txt -@@ -11,7 +11,12 @@ - #============================================================================= - - project(QtDialog) --find_package(Qt5Widgets QUIET) -+option(WITH_Qt5 ON) -+ -+if(WITH_Qt5) -+ find_package(Qt5Widgets QUIET) -+endif() -+ - if (Qt5Widgets_FOUND) - include_directories(${Qt5Widgets_INCLUDE_DIRS}) - add_definitions(${Qt5Widgets_DEFINITONS}) diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch deleted file mode 100644 index 28d2e4f..0000000 --- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake ---- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100 -+++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100 -@@ -33,6 +33,8 @@ - ${Python_ADDITIONAL_VERSIONS} - 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - -+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" -+ OUTPUT_VARIABLE _Python_VERSIONS) - FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) diff --git a/dev-util/cmake/files/cmake-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch deleted file mode 100644 index 64af9d3..0000000 --- a/dev-util/cmake/files/cmake-2.8.8-tests.patch +++ /dev/null @@ -1,58 +0,0 @@ -Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root ---- cmake-2.8.8/Tests/CMakeLists.txt -+++ cmake-2.8.8/Tests/CMakeLists.txt -@@ -273,23 +273,6 @@ - ) - LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities") - -- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities) -- # this test also depends on the existence of the standard qtiff plugin -- if(QT4_WORKS AND QT_QTSQL_FOUND) -- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND} -- --build-and-test -- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy" -- "${CMake_BINARY_DIR}/Tests/Qt4Deploy" -- --build-generator ${CMAKE_TEST_GENERATOR} -- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} -- --build-project Qt4Deploy -- --build-options -- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -- ) -- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy") -- endif() -- - endif() - endif() - -@@ -1548,30 +1531,6 @@ - LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}") - ENDIF(Subversion_FOUND) - -- # Test CTest Update with CVS -- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) -- FIND_PACKAGE(CVS QUIET) -- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) -- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs) -- SET(CVS_FOUND ${CVS_EXECUTABLE}) -- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) -- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND}) -- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) -- IF("${CVS_EXECUTABLE}" MATCHES "cygwin") -- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!") -- SET(CTEST_TEST_UPDATE_CVS 0) -- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin") -- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) -- IF(CTEST_TEST_UPDATE_CVS) -- SET(CTestUpdateCVS_DIR "CTest UpdateCVS") -- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in" -- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY) -- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND} -- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" -- ) -- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}") -- ENDIF(CTEST_TEST_UPDATE_CVS) -- - # Test CTest Update with BZR - FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr) - MARK_AS_ADVANCED(BZR_EXECUTABLE) diff --git a/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch deleted file mode 100644 index 4e833ca..0000000 --- a/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 3f5fa933d17e24cafd75ae28c00f4fc0292eae92 Mon Sep 17 00:00:00 2001 -From: Johannes Huber -Date: Wed, 15 Aug 2012 14:42:16 +0200 -Subject: [PATCH] Set some proper paths to make cmake find our tools. - -The ebuild now adds an extra / at the end of $EPREFIX so that it is -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains -correct) - -Original patch by Heiko Przybyl. -Updated by Chris Reffett (cmake-2.8.8) -Update by Johannes Huber (cmake-2.8.9) ---- - Modules/Platform/Darwin.cmake | 12 +++++++---- - Modules/Platform/UnixPaths.cmake | 43 +++++++++++++++++++------------------- - 2 files changed, 29 insertions(+), 26 deletions(-) - -diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake -index eff07b2..cbedc47 100644 ---- a/Modules/Platform/Darwin.cmake -+++ b/Modules/Platform/Darwin.cmake -@@ -228,24 +228,28 @@ SET(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK - " -o ") - - --# default to searching for frameworks first -+# default to searching for frameworks last - IF(NOT DEFINED CMAKE_FIND_FRAMEWORK) -- SET(CMAKE_FIND_FRAMEWORK FIRST) -+ SET(CMAKE_FIND_FRAMEWORK LAST) - ENDIF() - # set up the default search directories for frameworks - SET(CMAKE_SYSTEM_FRAMEWORK_PATH -+ @GENTOO_PORTAGE_EPREFIX@Frameworks -+ @GENTOO_PORTAGE_EPREFIX@usr/lib - ~/Library/Frameworks - /Library/Frameworks - /Network/Library/Frameworks - /System/Library/Frameworks) - --# default to searching for application bundles first -+# default to searching for application bundles last - IF(NOT DEFINED CMAKE_FIND_APPBUNDLE) -- SET(CMAKE_FIND_APPBUNDLE FIRST) -+ SET(CMAKE_FIND_APPBUNDLE LAST) - ENDIF() - # set up the default search directories for application bundles - SET(_apps_paths) - FOREACH(_path -+ @GENTOO_PORTAGE_EPREFIX@Applications -+ @GENTOO_PORTAGE_EPREFIX@usr/bin - "~/Applications" - "/Applications" - "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index 5ee7ddb..961746d 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,6 +33,7 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) - # search types. - LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ - /usr/local /usr / - - # CMake install location -@@ -44,43 +45,41 @@ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH - - # List common include file locations not under the common prefixes. - LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include - ) - - LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - ) - - LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @GENTOO_PORTAGE_EPREFIX@usr/bin -+ @GENTOO_PORTAGE_EPREFIX@bin - ) - - LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /usr/lib /usr/lib32 /usr/lib64 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib -+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 - ) - - LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - --- -1.7.9.7 - diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml index a23f444..f5a3d63 100644 --- a/dev-util/cmake/metadata.xml +++ b/dev-util/cmake/metadata.xml @@ -2,4 +2,7 @@ kde + + Adds support for the Qt GUI/Application Toolkit version 5.x +