diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-09-02 12:59:54 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-09-02 12:59:54 +0000 |
| commit | 68bc4af5c80eec76814f1f743dfc2c7bd4a356ef (patch) | |
| tree | 67cd40943f0ef7eea725ecad6987a3d3cd88625d /games/hedgewars | |
| parent | 5ead879a859c7215261464b4b594158d31c2da8f (diff) | |
| download | ports-68bc4af5c80eec76814f1f743dfc2c7bd4a356ef.tar.gz ports-68bc4af5c80eec76814f1f743dfc2c7bd4a356ef.zip | |
Notes
Diffstat (limited to 'games/hedgewars')
| -rw-r--r-- | games/hedgewars/files/patch-share__hedgewars__Data__Locale__CMakeLists.txt | 21 | ||||
| -rw-r--r-- | games/hedgewars/files/patch-tools__CMakeLists.txt | 23 |
2 files changed, 44 insertions, 0 deletions
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 <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) 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 <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}" |