Date: Tue, 2 Sep 2014 12:59:54 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366996 - in head: Mk/Uses audio/clementine-player/files devel/cmake devel/cmake-gui devel/cmake-gui/files devel/cmake-modules devel/cmake/files devel/qross/files games/hedgewars/files ... Message-ID: <201409021259.s82Cxs6a019890@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue Sep 2 12:59:54 2014 New Revision: 366996 URL: http://svnweb.freebsd.org/changeset/ports/366996 QAT: https://qat.redports.org/buildarchive/r366996/ Log: Update CMake to 3.0.1. The 3.0 series is an incremental improvement over the previous 2.8 series despite the major version number change. A list of important changes is available at http://www.cmake.org/cmake/help/v3.0/release/3.0.0.html On the porting side * The minimum FreeBSD release we have to support in the ports tree is now recent enough that ports/168671 can finally be committed: instead of building and using CMake's own copies of bzip2, curl, expat, libarchive, liblzma and zlib, we use the versions in ports and/or the base system. * CMake's documentation system has been changed and vastly improved at the cost of now depending on Sphinx. We still generate only man pages, but can start generating the HTML documentation in the future if desired. * devel/cmake-gui now uses Qt5 instead of Qt4 and does not needlessly build the ncurses UI that is installed by devel/cmake itself. * CMake commit 3816cd2 fixes a longstanding issue in the detection of the Python interpreter and its libraries, but requires us to revert a workaround for that in Mk/Uses/python.mk itself, effectively reverting the patch introduced by ports/168159. * Similarly, a few ports had to be fixed manually due to CMake being stricter when parsing some files or the ports detecting Python the wrong way. Fortunately, they all had been fixed upstream so I just grabbed the appropriate commits and pointed to them in the patches. science/gnudatalanguage had to have its PORTREVISION bumped because switching to USES=cmake:outsource removed a few files from the plist that were not supposed to have been installed in the first place. PR: 168671 PR: 192644 Added: head/devel/cmake-gui/files/patch-Utilities__Sphinx__CMakeLists.txt (contents, props changed) head/devel/qross/files/patch-bindings__python__qrosspython__CMakeLists.txt (contents, props changed) head/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt (contents, props changed) head/games/hedgewars/files/patch-tools__CMakeLists.txt (contents, props changed) head/games/spring/files/patch-tools__unitsync__test__CMakeLists.txt (contents, props changed) head/graphics/cegui/files/patch-CMakeLists.txt (contents, props changed) head/graphics/cegui/files/patch-cmake__CEGUIMacros.cmake (contents, props changed) Deleted: head/devel/cmake-gui/files/patch-Source__kwsys__SystemInformation.cxx head/devel/cmake/files/patch-Modules_FindFreetype.cmake head/devel/cmake/files/patch-Source__kwsys__SystemInformation.cxx Modified: head/Mk/Uses/python.mk head/audio/clementine-player/files/patch-src_CMakeLists.txt head/devel/cmake-gui/Makefile head/devel/cmake-modules/Makefile head/devel/cmake-modules/pkg-plist head/devel/cmake/distinfo head/devel/cmake/files/patch-CMakeLists.txt head/devel/cmake/files/patch-Modules_FindQt4.cmake head/devel/cmake/pkg-plist head/science/gnudatalanguage/Makefile head/science/gnudatalanguage/files/patch-CMakeLists.txt head/science/gnudatalanguage/pkg-plist Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Tue Sep 2 12:45:01 2014 (r366995) +++ head/Mk/Uses/python.mk Tue Sep 2 12:59:54 2014 (r366996) @@ -656,16 +656,6 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPR PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \ PYTHON_VERSION=${PYTHON_VERSION} -# If multiple Python versions are installed and cmake is used, it might -# happen that a cmake-enabled port using find_package(PythonLibs) and -# find_package(PythonInterp) detects different Python versions. -# This in turn might cause it to link against version X while using the -# includes of version Y, leading to a broken port. -# Enforce a certain Python version by using PYTHON_VER for cmake. -CMAKE_ARGS+= \ - -DPythonLibs_FIND_VERSION:STRING="${PYTHON_VER}" \ - -DPythonInterp_FIND_VERSION:STRING="${PYTHON_VER}" - _USES_POST+= python .endif # _INCLUDE_USES_PYTHON_MK Modified: head/audio/clementine-player/files/patch-src_CMakeLists.txt ============================================================================== --- head/audio/clementine-player/files/patch-src_CMakeLists.txt Tue Sep 2 12:45:01 2014 (r366995) +++ head/audio/clementine-player/files/patch-src_CMakeLists.txt Tue Sep 2 12:59:54 2014 (r366996) @@ -1,5 +1,35 @@ +Includes the following upstream commit to fix the build with CMake 3.0+: + +commit ec580cb815c16ec1ab43a469d5af7d51d8d03082 +Author: Chocobozzz <florian.chocobo@gmail.com> +Date: Wed Jul 16 15:57:25 2014 +0200 + + No namespaces for DBus interfaces. Fixes #4401 --- src/CMakeLists.txt.orig 2013-10-20 17:40:58.416968707 +0000 +++ src/CMakeLists.txt 2013-10-20 17:41:24.671967496 +0000 +@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) + if(HAVE_DBUS) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) + +- # Hack to get it to generate interfaces without namespaces - required +- # because otherwise org::freedesktop::UDisks and +- # org::freedesktop::UDisks::Device conflict. +- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) +- + # MPRIS DBUS interfaces + qt4_add_dbus_adaptor(SOURCES + dbus/org.freedesktop.MediaPlayer.player.xml +@@ -964,6 +959,10 @@ if(HAVE_DBUS) + + # DeviceKit DBUS interfaces + if(HAVE_DEVICEKIT) ++ set_source_files_properties(dbus/org.freedesktop.UDisks.xml ++ PROPERTIES NO_NAMESPACE dbus/udisks) ++ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml ++ PROPERTIES NO_NAMESPACE dbus/udisksdevice) + qt4_add_dbus_interface(SOURCES + dbus/org.freedesktop.UDisks.xml + dbus/udisks) @@ -1322,6 +1322,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") Modified: head/devel/cmake-gui/Makefile ============================================================================== --- head/devel/cmake-gui/Makefile Tue Sep 2 12:45:01 2014 (r366995) +++ head/devel/cmake-gui/Makefile Tue Sep 2 12:59:54 2014 (r366996) @@ -1,25 +1,31 @@ # $FreeBSD$ PORTNAME= cmake -PORTVERSION= 2.8.12.1 -PORTREVISION= 1 +PORTVERSION= 3.0.1 CATEGORIES= devel -MASTER_SITES= http://www.cmake.org/files/v2.8/ +MASTER_SITES= http://www.cmake.org/files/v3.0/ PKGNAMESUFFIX= -gui MAINTAINER= kde@FreeBSD.org -COMMENT= Qt4 GUI for cmake +COMMENT= Qt-based GUI for CMake LICENSE= BSD3CLAUSE -USE_QT4= gui qmake_build moc_build uic_build rcc_build +BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libexpat.so:${PORTSDIR}/textproc/expat2 + +USE_QT5= core gui widgets buildtools_build qmake_build USES= cmake:run shared-mime-info CMAKE_ARGS= -DBUILD_QtDialog:bool=on \ + -DBUILD_CursesDialog:BOOL=OFF \ + -DSPHINX_MAN:BOOL=ON \ + -DCMAKE_USE_SYSTEM_LIBRARIES:BOOL=ON \ -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" -BUILD_WRKSRC= ${WRKSRC}/Source/QtDialog -INSTALL_WRKSRC= ${BUILD_WRKSRC} +ALL_TARGET= cmake-gui documentation +INSTALL_WRKSRC= ${WRKSRC}/Source/QtDialog DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo @@ -31,9 +37,9 @@ post-patch: pre-install: ${LN} -sf ${CMAKE_BIN} ${WRKSRC}/bin - ${WRKSRC}/bin/cmake-gui --help-man > ${WRKSRC}/cmake-gui.1 post-install: - ${INSTALL_MAN} ${WRKSRC}/cmake-gui.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Utilities/Sphinx/man/cmake-gui.1 \ + ${STAGEDIR}${PREFIX}/man/man1 .include <bsd.port.mk> Added: head/devel/cmake-gui/files/patch-Utilities__Sphinx__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmake-gui/files/patch-Utilities__Sphinx__CMakeLists.txt Tue Sep 2 12:59:54 2014 (r366996) @@ -0,0 +1,26 @@ +Make the `documentation' target stop depending on basically all other targets, +since we are only interested in building the cmake-gui one. If we don't do +this, building the documentation will build all other targets which are only +needed by devel/cmake itself. +--- Utilities/Sphinx/CMakeLists.txt ++++ Utilities/Sphinx/CMakeLists.txt +@@ -93,19 +93,6 @@ endforeach() + + add_custom_target(documentation ALL DEPENDS ${doc_format_outputs}) + +-foreach(t +- cmake +- ccmake +- cmake-gui +- cpack +- ctest +- ) +- if(TARGET ${t}) +- # Build documentation after main executables. +- add_dependencies(documentation ${t}) +- endif() +-endforeach() +- + if(SPHINX_MAN) + file(GLOB man_rst RELATIVE ${CMake_SOURCE_DIR}/Help/manual + ${CMake_SOURCE_DIR}/Help/manual/*.[1-9].rst) Modified: head/devel/cmake-modules/Makefile ============================================================================== --- head/devel/cmake-modules/Makefile Tue Sep 2 12:45:01 2014 (r366995) +++ head/devel/cmake-modules/Makefile Tue Sep 2 12:59:54 2014 (r366996) @@ -1,7 +1,6 @@ # Created by: gahr # $FreeBSD$ -PORTREVISION= 1 PKGNAMESUFFIX= -modules COMMENT= Modules and Templates for CMake Modified: head/devel/cmake-modules/pkg-plist ============================================================================== --- head/devel/cmake-modules/pkg-plist Tue Sep 2 12:45:01 2014 (r366995) +++ head/devel/cmake-modules/pkg-plist Tue Sep 2 12:59:54 2014 (r366996) @@ -1,5 +1,5 @@ %%DATADIR%%/Modules/AddFileDependencies.cmake -%%DATADIR%%/Modules/AutomocInfo.cmake.in +%%DATADIR%%/Modules/AutogenInfo.cmake.in %%DATADIR%%/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in %%DATADIR%%/Modules/BasicConfigVersion-ExactVersion.cmake.in %%DATADIR%%/Modules/BasicConfigVersion-SameMajorVersion.cmake.in @@ -27,6 +27,7 @@ %%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in %%DATADIR%%/Modules/CMakeCXXInformation.cmake %%DATADIR%%/Modules/CMakeClDeps.cmake +%%DATADIR%%/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake %%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake %%DATADIR%%/Modules/CMakeCompilerABI.h %%DATADIR%%/Modules/CMakeConfigurableFile.in @@ -50,9 +51,12 @@ %%DATADIR%%/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake %%DATADIR%%/Modules/CMakeFindBinUtils.cmake %%DATADIR%%/Modules/CMakeFindCodeBlocks.cmake +%%DATADIR%%/Modules/CMakeFindDependencyMacro.cmake %%DATADIR%%/Modules/CMakeFindEclipseCDT4.cmake %%DATADIR%%/Modules/CMakeFindFrameworks.cmake +%%DATADIR%%/Modules/CMakeFindJavaCommon.cmake %%DATADIR%%/Modules/CMakeFindKDevelop3.cmake +%%DATADIR%%/Modules/CMakeFindKate.cmake %%DATADIR%%/Modules/CMakeFindPackageMode.cmake %%DATADIR%%/Modules/CMakeFindWMake.cmake %%DATADIR%%/Modules/CMakeFindXCode.cmake @@ -95,16 +99,8 @@ %%DATADIR%%/Modules/CMakeTestRCCompiler.cmake %%DATADIR%%/Modules/CMakeTestWatcomVersion.c %%DATADIR%%/Modules/CMakeUnixFindMake.cmake -%%DATADIR%%/Modules/CMakeVS10FindMake.cmake -%%DATADIR%%/Modules/CMakeVS11FindMake.cmake -%%DATADIR%%/Modules/CMakeVS12FindMake.cmake %%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake -%%DATADIR%%/Modules/CMakeVS6FindMake.cmake -%%DATADIR%%/Modules/CMakeVS71FindMake.cmake %%DATADIR%%/Modules/CMakeVS7BackwardCompatibility.cmake -%%DATADIR%%/Modules/CMakeVS7FindMake.cmake -%%DATADIR%%/Modules/CMakeVS8FindMake.cmake -%%DATADIR%%/Modules/CMakeVS9FindMake.cmake %%DATADIR%%/Modules/CMakeVerifyManifest.cmake %%DATADIR%%/Modules/CPack.DS_Store.in %%DATADIR%%/Modules/CPack.Description.plist.in @@ -163,6 +159,9 @@ %%DATADIR%%/Modules/CheckVariableExists.c %%DATADIR%%/Modules/CheckVariableExists.cmake %%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake +%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake +%%DATADIR%%/Modules/Compiler/AppleClang-C.cmake +%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake %%DATADIR%%/Modules/Compiler/Clang-ASM.cmake %%DATADIR%%/Modules/Compiler/Clang-C.cmake %%DATADIR%%/Modules/Compiler/Clang-CXX.cmake @@ -200,6 +199,9 @@ %%DATADIR%%/Modules/Compiler/PathScale-CXX.cmake %%DATADIR%%/Modules/Compiler/PathScale-Fortran.cmake %%DATADIR%%/Modules/Compiler/PathScale.cmake +%%DATADIR%%/Modules/Compiler/QCC-C.cmake +%%DATADIR%%/Modules/Compiler/QCC-CXX.cmake +%%DATADIR%%/Modules/Compiler/QCC.cmake %%DATADIR%%/Modules/Compiler/SCO-C.cmake %%DATADIR%%/Modules/Compiler/SCO-CXX.cmake %%DATADIR%%/Modules/Compiler/SCO.cmake @@ -222,6 +224,7 @@ %%DATADIR%%/Modules/CompilerId/VS-10.vcxproj.in %%DATADIR%%/Modules/CompilerId/VS-6.dsp.in %%DATADIR%%/Modules/CompilerId/VS-7.vcproj.in +%%DATADIR%%/Modules/CompilerId/VS-Intel.vfproj.in %%DATADIR%%/Modules/CompilerId/Xcode-1.pbxproj.in %%DATADIR%%/Modules/CompilerId/Xcode-2.pbxproj.in %%DATADIR%%/Modules/CompilerId/Xcode-3.pbxproj.in @@ -242,6 +245,7 @@ %%DATADIR%%/Modules/FindBISON.cmake %%DATADIR%%/Modules/FindBLAS.cmake %%DATADIR%%/Modules/FindBZip2.cmake +%%DATADIR%%/Modules/FindBacktrace.cmake %%DATADIR%%/Modules/FindBoost.cmake %%DATADIR%%/Modules/FindBullet.cmake %%DATADIR%%/Modules/FindCABLE.cmake @@ -297,6 +301,7 @@ %%DATADIR%%/Modules/FindLibLZMA.cmake %%DATADIR%%/Modules/FindLibXml2.cmake %%DATADIR%%/Modules/FindLibXslt.cmake +%%DATADIR%%/Modules/FindLua.cmake %%DATADIR%%/Modules/FindLua50.cmake %%DATADIR%%/Modules/FindLua51.cmake %%DATADIR%%/Modules/FindMFC.cmake @@ -451,6 +456,8 @@ %%DATADIR%%/Modules/Platform/CYGWIN.cmake %%DATADIR%%/Modules/Platform/Catamount.cmake %%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake +%%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake +%%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake %%DATADIR%%/Modules/Platform/Darwin-CXX.cmake %%DATADIR%%/Modules/Platform/Darwin-Clang-C.cmake %%DATADIR%%/Modules/Platform/Darwin-Clang-CXX.cmake @@ -459,14 +466,15 @@ %%DATADIR%%/Modules/Platform/Darwin-GNU-CXX.cmake %%DATADIR%%/Modules/Platform/Darwin-GNU-Fortran.cmake %%DATADIR%%/Modules/Platform/Darwin-GNU.cmake +%%DATADIR%%/Modules/Platform/Darwin-Intel-C.cmake +%%DATADIR%%/Modules/Platform/Darwin-Intel-CXX.cmake %%DATADIR%%/Modules/Platform/Darwin-Intel-Fortran.cmake +%%DATADIR%%/Modules/Platform/Darwin-Intel.cmake %%DATADIR%%/Modules/Platform/Darwin-NAG-Fortran.cmake %%DATADIR%%/Modules/Platform/Darwin-VisualAge-C.cmake %%DATADIR%%/Modules/Platform/Darwin-VisualAge-CXX.cmake %%DATADIR%%/Modules/Platform/Darwin-XL-C.cmake %%DATADIR%%/Modules/Platform/Darwin-XL-CXX.cmake -%%DATADIR%%/Modules/Platform/Darwin-icc.cmake -%%DATADIR%%/Modules/Platform/Darwin-icpc.cmake %%DATADIR%%/Modules/Platform/Darwin.cmake %%DATADIR%%/Modules/Platform/DragonFly.cmake %%DATADIR%%/Modules/Platform/FreeBSD.cmake @@ -524,6 +532,7 @@ %%DATADIR%%/Modules/Platform/Linux-como.cmake %%DATADIR%%/Modules/Platform/Linux.cmake %%DATADIR%%/Modules/Platform/MP-RAS.cmake +%%DATADIR%%/Modules/Platform/MirBSD.cmake %%DATADIR%%/Modules/Platform/NetBSD.cmake %%DATADIR%%/Modules/Platform/OSF1.cmake %%DATADIR%%/Modules/Platform/OpenBSD.cmake @@ -545,6 +554,9 @@ %%DATADIR%%/Modules/Platform/Windows-Borland-C.cmake %%DATADIR%%/Modules/Platform/Windows-Borland-CXX.cmake %%DATADIR%%/Modules/Platform/Windows-CXX.cmake +%%DATADIR%%/Modules/Platform/Windows-Clang-C.cmake +%%DATADIR%%/Modules/Platform/Windows-Clang-CXX.cmake +%%DATADIR%%/Modules/Platform/Windows-Clang.cmake %%DATADIR%%/Modules/Platform/Windows-Embarcadero-C.cmake %%DATADIR%%/Modules/Platform/Windows-Embarcadero-CXX.cmake %%DATADIR%%/Modules/Platform/Windows-Embarcadero.cmake Modified: head/devel/cmake/distinfo ============================================================================== --- head/devel/cmake/distinfo Tue Sep 2 12:45:01 2014 (r366995) +++ head/devel/cmake/distinfo Tue Sep 2 12:59:54 2014 (r366996) @@ -1,2 +1,2 @@ -SHA256 (cmake-2.8.12.1.tar.gz) = fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67 -SIZE (cmake-2.8.12.1.tar.gz) = 6068021 +SHA256 (cmake-3.0.1.tar.gz) = ea11a8fb6679496de4e198ab93007968faa638663691cdf731ae2d4ed74e00c2 +SIZE (cmake-3.0.1.tar.gz) = 5490281 Modified: head/devel/cmake/files/patch-CMakeLists.txt ============================================================================== --- head/devel/cmake/files/patch-CMakeLists.txt Tue Sep 2 12:45:01 2014 (r366995) +++ head/devel/cmake/files/patch-CMakeLists.txt Tue Sep 2 12:59:54 2014 (r366996) @@ -1,11 +1,12 @@ ---- CMakeLists.txt.orig 2013-10-14 16:29:44.055730052 +0300 -+++ CMakeLists.txt 2013-10-14 16:30:05.395729128 +0300 -@@ -629,17 +629,17 @@ +--- CMakeLists.txt.orig 2014-07-27 16:06:05.000000000 +0300 ++++ CMakeLists.txt 2014-07-27 16:06:14.000000000 +0300 +@@ -574,18 +574,5 @@ + # Install license file as it requires. install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR}) - # Install script directories. +-# Install script directories. -install( -- DIRECTORY Modules Templates +- DIRECTORY Help Modules Templates - DESTINATION ${CMAKE_DATA_DIR} - FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE @@ -15,17 +16,6 @@ - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - ) -+# install( -+# DIRECTORY Modules Templates -+# DESTINATION ${CMAKE_DATA_DIR} -+# FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -+# DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE -+# GROUP_READ GROUP_EXECUTE -+# WORLD_READ WORLD_EXECUTE -+# PATTERN "*.sh*" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE -+# GROUP_READ GROUP_EXECUTE -+# WORLD_READ WORLD_EXECUTE -+# ) - - # process docs related install - add_subdirectory(Docs) +- + # Install auxiliary files integrating with other tools. + add_subdirectory(Auxiliary) Modified: head/devel/cmake/files/patch-Modules_FindQt4.cmake ============================================================================== --- head/devel/cmake/files/patch-Modules_FindQt4.cmake Tue Sep 2 12:45:01 2014 (r366995) +++ head/devel/cmake/files/patch-Modules_FindQt4.cmake Tue Sep 2 12:59:54 2014 (r366996) @@ -1,15 +1,6 @@ ---- Modules/FindQt4.cmake.orig 2013-06-22 14:07:09.000000000 +0300 -+++ Modules/FindQt4.cmake 2013-06-22 14:07:22.000000000 +0300 -@@ -569,7 +569,7 @@ - - set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) - --set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) -+set(_QT4_QMAKE_NAMES qmake-qt4 qmake qmake4 qmake-mac) - _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) - - if (QT_QMAKE_EXECUTABLE AND QTVERSION) -@@ -739,13 +739,7 @@ +--- Modules/FindQt4.cmake.orig 2014-07-27 16:08:51.000000000 +0300 ++++ Modules/FindQt4.cmake 2014-07-27 16:10:01.000000000 +0300 +@@ -701,14 +701,7 @@ # ask qmake for the plugins directory if (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED) _qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir) @@ -19,12 +10,13 @@ - endforeach() - find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer - HINTS ${qt_cross_paths} ${qt_plugins_dir} -- DOC "The location of the Qt plugins") +- DOC "The location of the Qt plugins" +- NO_CMAKE_FIND_ROOT_PATH) + set(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE) endif () # ask qmake for the translations directory -@@ -758,15 +752,7 @@ +@@ -721,16 +714,7 @@ if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir) if(qt_imports_dir) @@ -35,6 +27,7 @@ - find_path(QT_IMPORTS_DIR NAMES Qt - HINTS ${qt_cross_paths} ${qt_imports_dir} - DOC "The location of the Qt imports" +- NO_CMAKE_FIND_ROOT_PATH - NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH - NO_CMAKE_SYSTEM_PATH) + set(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports" FORCE) Modified: head/devel/cmake/pkg-plist ============================================================================== --- head/devel/cmake/pkg-plist Tue Sep 2 12:45:01 2014 (r366995) +++ head/devel/cmake/pkg-plist Tue Sep 2 12:59:54 2014 (r366996) @@ -4,14 +4,21 @@ bin/cpack bin/ctest man/man1/ccmake.1.gz man/man1/cmake.1.gz -man/man1/cmakecommands.1.gz -man/man1/cmakecompat.1.gz -man/man1/cmakemodules.1.gz -man/man1/cmakepolicies.1.gz -man/man1/cmakeprops.1.gz -man/man1/cmakevars.1.gz man/man1/cpack.1.gz man/man1/ctest.1.gz +man/man7/cmake-buildsystem.7.gz +man/man7/cmake-commands.7.gz +man/man7/cmake-developer.7.gz +man/man7/cmake-generator-expressions.7.gz +man/man7/cmake-generators.7.gz +man/man7/cmake-language.7.gz +man/man7/cmake-modules.7.gz +man/man7/cmake-packages.7.gz +man/man7/cmake-policies.7.gz +man/man7/cmake-properties.7.gz +man/man7/cmake-qt.7.gz +man/man7/cmake-toolchains.7.gz +man/man7/cmake-variables.7.gz share/aclocal/cmake.m4 %%DATADIR%%/completions/cmake %%DATADIR%%/completions/cpack @@ -22,42 +29,10 @@ share/aclocal/cmake.m4 %%DATADIR%%/editors/vim/cmake-syntax.vim %%DATADIR%%/include/cmCPluginAPI.h %%PORTDOCS%%%%DOCSDIR%%/Copyright.txt -%%PORTDOCS%%%%DOCSDIR%%/ccmake.docbook -%%PORTDOCS%%%%DOCSDIR%%/ccmake.html -%%PORTDOCS%%%%DOCSDIR%%/ccmake.txt -%%PORTDOCS%%%%DOCSDIR%%/cmake-commands.html -%%PORTDOCS%%%%DOCSDIR%%/cmake-commands.txt -%%PORTDOCS%%%%DOCSDIR%%/cmake-compatcommands.html -%%PORTDOCS%%%%DOCSDIR%%/cmake-compatcommands.txt -%%PORTDOCS%%%%DOCSDIR%%/cmake-modules.html -%%PORTDOCS%%%%DOCSDIR%%/cmake-modules.txt -%%PORTDOCS%%%%DOCSDIR%%/cmake-policies.html -%%PORTDOCS%%%%DOCSDIR%%/cmake-policies.txt -%%PORTDOCS%%%%DOCSDIR%%/cmake-properties.html -%%PORTDOCS%%%%DOCSDIR%%/cmake-properties.txt -%%PORTDOCS%%%%DOCSDIR%%/cmake-variables.html -%%PORTDOCS%%%%DOCSDIR%%/cmake-variables.txt -%%PORTDOCS%%%%DOCSDIR%%/cmake.docbook -%%PORTDOCS%%%%DOCSDIR%%/cmake.html -%%PORTDOCS%%%%DOCSDIR%%/cmake.txt %%PORTDOCS%%%%DOCSDIR%%/cmcompress/Copyright.txt -%%PORTDOCS%%%%DOCSDIR%%/cmcurl/COPYING -%%PORTDOCS%%%%DOCSDIR%%/cmexpat/COPYING -%%PORTDOCS%%%%DOCSDIR%%/cmlibarchive/COPYING %%PORTDOCS%%%%DOCSDIR%%/cmsys/Copyright.txt -%%PORTDOCS%%%%DOCSDIR%%/cmzlib/Copyright.txt -%%PORTDOCS%%%%DOCSDIR%%/cpack.docbook -%%PORTDOCS%%%%DOCSDIR%%/cpack.html -%%PORTDOCS%%%%DOCSDIR%%/cpack.txt -%%PORTDOCS%%%%DOCSDIR%%/ctest.docbook -%%PORTDOCS%%%%DOCSDIR%%/ctest.html -%%PORTDOCS%%%%DOCSDIR%%/ctest.txt share/emacs/site-lisp/cmake-mode.el -%%PORTDOCS%%@dirrm %%DOCSDIR%%/cmzlib %%PORTDOCS%%@dirrm %%DOCSDIR%%/cmsys -%%PORTDOCS%%@dirrm %%DOCSDIR%%/cmlibarchive -%%PORTDOCS%%@dirrm %%DOCSDIR%%/cmexpat -%%PORTDOCS%%@dirrm %%DOCSDIR%%/cmcurl %%PORTDOCS%%@dirrm %%DOCSDIR%%/cmcompress %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/include Added: head/devel/qross/files/patch-bindings__python__qrosspython__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qross/files/patch-bindings__python__qrosspython__CMakeLists.txt Tue Sep 2 12:59:54 2014 (r366996) @@ -0,0 +1,28 @@ +From 9053d214840639c3deabb7902a00a37356fdf32e Mon Sep 17 00:00:00 2001 +From: 0xd34df00d <0xd34df00d@gmail.com> +Date: Fri, 4 Jul 2014 00:54:01 +0400 +Subject: [PATCH] CMake 3.x compatibility in Python bindings. + +--- + src/bindings/python/qrosspython/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/bindings/python/qrosspython/CMakeLists.txt b/src/bindings/python/qrosspython/CMakeLists.txt +index 5bd5b73..e0a0e68 100644 +--- bindings/python/qrosspython/CMakeLists.txt ++++ bindings/python/qrosspython/CMakeLists.txt +@@ -5,8 +5,12 @@ find_package(Qt4 REQUIRED) + set(QT_USE_QTTEST TRUE) + include(${QT_USE_FILE}) + +-set (PythonLibs_FIND_VERSION 2.7) +-find_package(PythonLibs REQUIRED) ++if (${CMAKE_MAJOR_VERSION} EQUAL 2) ++ set (PythonLibs_FIND_VERSION 2.7) ++ find_package(PythonLibs REQUIRED) ++else () ++ find_package(PythonLibs "2.7" REQUIRED) ++endif () + + include_directories( + ${PYTHON_INCLUDE_PATH} Added: head/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt Tue Sep 2 12:59:54 2014 (r366996) @@ -0,0 +1,21 @@ +From 774cfec959227a52b9a54afa8b069277c2f7e656 Mon Sep 17 00:00:00 2001 +From: sheepluva <sheepyluva@gmail.com> +Date: Fri, 15 Aug 2014 08:23:15 +0200 +Subject: [PATCH] part of patch in issue 803 (ty) - this hopefully should fix + issues with cmake Makefiles trying to run "Qt4::lrelease" in the shell + +--- + share/hedgewars/Data/Locale/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/share/hedgewars/Data/Locale/CMakeLists.txt b/share/hedgewars/Data/Locale/CMakeLists.txt +index 6075ecb..3e0dada 100644 +--- share/hedgewars/Data/Locale/CMakeLists.txt ++++ share/hedgewars/Data/Locale/CMakeLists.txt +@@ -1,3 +1,6 @@ ++find_package(Qt4 REQUIRED) ++include(${QT_USE_FILE}) ++ + file(GLOB txttrans2 ??.txt) + file(GLOB txttrans5 ?????.txt) + file(GLOB tsfiles *.ts) Added: head/games/hedgewars/files/patch-tools__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/hedgewars/files/patch-tools__CMakeLists.txt Tue Sep 2 12:59:54 2014 (r366996) @@ -0,0 +1,23 @@ +From b2d1b0d292c71b5a4266c9359280fa32a35ac56d Mon Sep 17 00:00:00 2001 +From: sheepluva <sheepyluva@gmail.com> +Date: Wed, 13 Aug 2014 15:16:33 +0200 +Subject: [PATCH] this should fix the cmake 3.0 issue. thanks to Spacey for + reporting + +--- + tools/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index b55f09c..3da80ab 100644 +--- tools/CMakeLists.txt ++++ tools/CMakeLists.txt +@@ -57,7 +57,7 @@ if(APPLE) + + #create the .dmg for deployment + #first make sure .app exists, then remove any old .dmg with same name, finally run the script +- add_custom_target(dmg COMMAND if [ ! -a Hedgewars.app ]; then make install\; fi; ++ add_custom_target(dmg COMMAND "if [ ! -a Hedgewars.app ]; then make install\; fi;" + COMMAND rm -f ${CMAKE_BINARY_DIR}/Hedgewars-${HEDGEWARS_VERSION}.dmg + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/create-dmg.sh + --volname "Hedgewars ${HEDGEWARS_VERSION}" Added: head/games/spring/files/patch-tools__unitsync__test__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-tools__unitsync__test__CMakeLists.txt Tue Sep 2 12:59:54 2014 (r366996) @@ -0,0 +1,24 @@ +From f55278791ac68eafc72b376a8c68b7002d82647c Mon Sep 17 00:00:00 2001 +From: abma <spring@abma.de> +Date: Wed, 4 Jun 2014 14:49:56 +0200 +Subject: [PATCH] fix #4415 + +--- + tools/unitsync/test/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/tools/unitsync/test/CMakeLists.txt b/tools/unitsync/test/CMakeLists.txt +index 9203560..5961130 100644 +--- tools/unitsync/test/CMakeLists.txt ++++ tools/unitsync/test/CMakeLists.txt +@@ -10,10 +10,6 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + + REMOVE_DEFINITIONS(-DUNITSYNC) + +-# To allow linking to MODULE_LIBRARY targets +-CMAKE_POLICY(SET CMP0001 OLD) +-SET(CMAKE_BACKWARDS_COMPATIBILITY "2.2") +- + ADD_EXECUTABLE(lua2php EXCLUDE_FROM_ALL lua2php.cpp) + TARGET_LINK_LIBRARIES(lua2php unitsync ${CMAKE_DL_LIBS}) + ADD_DEPENDENCIES(lua2php unitsync) Added: head/graphics/cegui/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/cegui/files/patch-CMakeLists.txt Tue Sep 2 12:59:54 2014 (r366996) @@ -0,0 +1,23 @@ +This is part of a changeset required for the port to build with CMake 3.0. +See patch-cmake__CEGUIMacros.cmake as well. + +# HG changeset patch +# User Danduk82 <danduk82@hotmail.com> +# Date 1390065964 -3600 +# Branch v0-8 +# Node ID 320ecd58eb1b3d673eee62a913041f643c50d483 +# Parent 83954df05b3b1b94ada2137ef5d028de54d11818 +A) fixed new CMAKE policy CMP0045 issue in CMakeLists.txt. This feature was introduced recently in this commit: https://gitorious.org/cmake/cmake/commit/73e93400e2efab2096618ff58a5ad68236cd04aa ... Bb) fixed CMAKE problem with cmake/CEGUIMacros.cmake when including the project with ExternalProject_Add() CMAKE feature in a project. I had to escape the '[' and ']' characters because in this way CMAKE was not recognizing those characters. CMAKE version: 2.8.12. +--- ./CMakeLists.txt.orig 2013-12-07 11:37:07.000000000 +0200 ++++ ./CMakeLists.txt 2014-08-29 00:28:26.000000000 +0300 +@@ -6,6 +6,10 @@ + cmake_policy(SET CMP0017 OLD) + endif() + ++if (POLICY CMP0045) ++ cmake_policy(SET CMP0045 OLD) ++endif() ++ + set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + include(CEGUIMacros) + include(CMakeDependentOption) Added: head/graphics/cegui/files/patch-cmake__CEGUIMacros.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/cegui/files/patch-cmake__CEGUIMacros.cmake Tue Sep 2 12:59:54 2014 (r366996) @@ -0,0 +1,70 @@ +These two commits are required for the port to build with CMake 3.0. +See patch-CMakeLists.txt as well. + +# HG changeset patch +# User Danduk82 <danduk82@hotmail.com> +# Date 1390065964 -3600 +# Branch v0-8 +# Node ID 320ecd58eb1b3d673eee62a913041f643c50d483 +# Parent 83954df05b3b1b94ada2137ef5d028de54d11818 +A) fixed new CMAKE policy CMP0045 issue in CMakeLists.txt. This feature was introduced recently in this commit: https://gitorious.org/cmake/cmake/commit/73e93400e2efab2096618ff58a5ad68236cd04aa ... Bb) fixed CMAKE problem with cmake/CEGUIMacros.cmake when including the project with ExternalProject_Add() CMAKE feature in a project. I had to escape the '[' and ']' characters because in this way CMAKE was not recognizing those characters. CMAKE version: 2.8.12. + +# HG changeset patch +# User Paul Turner <paul@cegui.org.uk> +# Date 1402736843 -3600 +# Branch v0-8 +# Node ID 72b84028e58fc307cb2c9749d5cd17fc71059e6a +# Parent 243fc257b6c94452c13cceb65452a665509669dc +FIX: switch to 'if test' syntax from 'if [' for shell commands (cmake issues) +--- ./cmake/CEGUIMacros.cmake.orig 2014-08-29 00:28:26.000000000 +0300 ++++ ./cmake/CEGUIMacros.cmake 2014-08-29 00:28:30.000000000 +0300 +@@ -309,33 +309,33 @@ + endif() + + add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD +- COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\" ++ COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\" + COMMENT "Removing old Frameworks in ${_TARGET_NAME}.app") + add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD +- COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\" ++ COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\" + COMMENT "Removing old Resources in ${_TARGET_NAME}.app") + + add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD +- COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\" ++ COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\" + COMMENT "Creating Frameworks directory ${_TARGET_NAME}.app") + add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD +- COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\" ++ COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\" + COMMENT "Creating Resources directory ${_TARGET_NAME}.app") + + if (NOT ${_STATIC}) + if (NOT CEGUI_BUILD_SHARED_LIBS_WITH_STATIC_DEPENDENCIES) + add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD +- COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_PREFIX_PATH}/lib/dynamic/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\" ++ COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_PREFIX_PATH}/lib/dynamic/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\" + COMMENT "Creating ${_ACTIONMSG} dependency libraries in ${_TARGET_NAME}.app") + endif() + + add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD +- COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\" ++ COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\" + COMMENT "Creating ${_ACTIONMSG} built cegui libraries in ${_TARGET_NAME}.app") + endif() + + add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD +- COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_SOURCE_DIR}/datafiles \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/\" ++ COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_SOURCE_DIR}/datafiles \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/\" + COMMENT "Creating ${_ACTIONMSG} sample datafiles ${_TARGET_NAME}.app") + + # When CEGUI_APPLE_SYMLINK_DEPENDENCIES_TO_SAMPLE_APPS is TRUE, this +@@ -345,7 +345,7 @@ + # CEGUI_APPLE_SYMLINK_DEPENDENCIES_TO_SAMPLE_APPS to false and the thing + # will be copied to the output app bundle instead. + add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD +- COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_BINARY_DIR}/datafiles/samples \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/datafiles\" ++ COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_BINARY_DIR}/datafiles/samples \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/datafiles\" + COMMENT "Creating ${_ACTIONMSG} samples.xml ${_TARGET_NAME}.app") + endmacro() + Modified: head/science/gnudatalanguage/Makefile ============================================================================== --- head/science/gnudatalanguage/Makefile Tue Sep 2 12:45:01 2014 (r366995) +++ head/science/gnudatalanguage/Makefile Tue Sep 2 12:59:54 2014 (r366996) @@ -3,7 +3,7 @@ PORTNAME= gnudatalanguage DISTVERSION= 0.9.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${DISTVERSION} .if defined(BUILD_PYTHON_MODULE) @@ -37,7 +37,7 @@ LIB_DEPENDS+= libplplotd.so:${PORTSDIR}/ USE_WX= 2.8 WX_UNICODE= yes USE_XORG= x11 -USES= pkgconfig cmake dos2unix compiler:gcc-c++11-lib +USES= pkgconfig cmake:outsource dos2unix compiler:gcc-c++11-lib # Disable ncurses and readline from ports # Disable ImageMagick (does'nt work with plplot because dynamic drivers Modified: head/science/gnudatalanguage/files/patch-CMakeLists.txt ============================================================================== --- head/science/gnudatalanguage/files/patch-CMakeLists.txt Tue Sep 2 12:45:01 2014 (r366995) +++ head/science/gnudatalanguage/files/patch-CMakeLists.txt Tue Sep 2 12:59:54 2014 (r366996) @@ -1,5 +1,32 @@ +Includes revisions 1.50 and 1.57 from upstream: + + Fri Jun 13 21:45:44 2014 UTC by gilles-duvert + Applied Orion's patch #77 + + Mon Sep 1 11:23:18 2014 UTC by alaingdl + patch 78 related to change in CMake 3.0 + +Both patches are required for CMake 3.0+ support. --- ./CMakeLists.txt.orig 2013-09-28 17:03:32.000000000 +0200 +++ ./CMakeLists.txt 2013-09-30 16:19:09.000000000 +0200 +@@ -610,13 +610,11 @@ + message("-- Found Python executable: ${PYTHON_EXECUTABLE}") + endif() + else() +- if(PYTHONVERSION) +- set(PythonLibs_FIND_VERSION ${PYTHONVERSION}) +- else() +- set(PythonLibs_FIND_VERSION 2) ++ if(NOT PYTHONVERSION) ++ set(PYTHONVERSION 2) + endif() +- find_package(PythonLibs) +- include(FindPythonInterp) ++ find_package(PythonInterp) ++ find_package(PythonLibs ${PYTHONVERSION}) + endif() + set(USE_PYTHON ${PYTHONLIBS_FOUND}) + if(PYTHONLIBS_FOUND) @@ -752,7 +752,7 @@ endif(NOT PYTHON_MODULE) Modified: head/science/gnudatalanguage/pkg-plist ============================================================================== --- head/science/gnudatalanguage/pkg-plist Tue Sep 2 12:45:01 2014 (r366995) +++ head/science/gnudatalanguage/pkg-plist Tue Sep 2 12:59:54 2014 (r366996) @@ -1,33 +1,10 @@ %%MASTER%%bin/gdl -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/CMakeDirectoryInformation.cmake -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir/DependInfo.cmake -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir/build.make -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir/cmake_clean.cmake -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir/progress.make -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/DependInfo.cmake -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/build.make -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/cmake_clean.cmake -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/depend.make -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/flags.make -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/link.txt -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/progress.make -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/progress.marks -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/DependInfo.cmake -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/build.make -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/cmake_clean.cmake -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/depend.make -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/flags.make -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/link.txt -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/progress.make %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeLists.txt -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CTestTestfile.cmake -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile.am %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/README %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Saturn.jpg %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/bench_matrix_multiply.pro %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/checks -%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/cmake_install.cmake %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/example.grib %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/image_test.pro %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/launchtest.c @@ -363,9 +340,5 @@ %%MASTER%%@dirrm %%DATADIR%%/lib %%MASTER%%@dirrm %%DATADIR%% %%MASTER%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/testsuite/benchmark -%%MASTER%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir -%%MASTER%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir -%%MASTER%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir -%%MASTER%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/testsuite/CMakeFiles %%MASTER%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/testsuite %%MASTER%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409021259.s82Cxs6a019890>