From 68bc4af5c80eec76814f1f743dfc2c7bd4a356ef Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Tue, 2 Sep 2014 12:59:54 +0000 Subject: 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 --- ...-share__hedgewars__Data__Locale__CMakeLists.txt | 21 ++++++++++++++++++++ games/hedgewars/files/patch-tools__CMakeLists.txt | 23 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt create mode 100644 games/hedgewars/files/patch-tools__CMakeLists.txt (limited to 'games/hedgewars') diff --git a/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt b/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt new file mode 100644 index 000000000000..951d88c8eee6 --- /dev/null +++ b/games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt @@ -0,0 +1,21 @@ +From 774cfec959227a52b9a54afa8b069277c2f7e656 Mon Sep 17 00:00:00 2001 +From: sheepluva +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) diff --git a/games/hedgewars/files/patch-tools__CMakeLists.txt b/games/hedgewars/files/patch-tools__CMakeLists.txt new file mode 100644 index 000000000000..5389b7300bd6 --- /dev/null +++ b/games/hedgewars/files/patch-tools__CMakeLists.txt @@ -0,0 +1,23 @@ +From b2d1b0d292c71b5a4266c9359280fa32a35ac56d Mon Sep 17 00:00:00 2001 +From: sheepluva +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}" -- cgit v1.2.3