Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-strategy/hedgewars/files: hedgewars-0.9.18-cmake.patch
Date: Thu, 01 Nov 2012 23:36:45
Message-Id: 20121101233628.024FC21600@flycatcher.gentoo.org
1 mr_bones_ 12/11/01 23:36:27
2
3 Added: hedgewars-0.9.18-cmake.patch
4 Log:
5 add parallel-make patch from hasufell
6
7 (Portage version: 2.1.11.9/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch?rev=1.1&content-type=text/plain
14
15 Index: hedgewars-0.9.18-cmake.patch
16 ===================================================================
17 From: Julian Ospald <hasufell@g.o>
18 Date: Thu Nov 1 21:52:40 UTC 2012
19 Subject: build system
20
21 fix parallel make
22
23 --- hedgewars/CMakeLists.txt
24 +++ hedgewars/CMakeLists.txt
25 @@ -193,7 +193,7 @@
26
27 #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6
28 if(fpc_version LESS "020600")
29 - add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
30 + add_custom_target(ENGINECLEAN COMMAND $(MAKE) "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
31 endif()
32
33
34 @@ -265,4 +265,6 @@
35 add_dependencies(${engine_output_name} ENGINECLEAN)
36 endif()
37
38 +add_dependencies(${engine_output_name} avwrapper)
39 +
40 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})