]>
Commit | Line | Data |
---|---|---|
20d6b224 JB |
1 | --- widelands-build19-src/CMakeLists.txt.orig 2016-11-10 08:28:01.000000000 +0100 |
2 | +++ widelands-build19-src/CMakeLists.txt 2017-07-15 17:41:44.154500573 +0200 | |
3 | @@ -98,6 +98,9 @@ | |
4 | elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") | |
5 | set(WL_OPTIMIZE_FLAGS "-O3") | |
6 | set(WL_DEBUG_FLAGS "-g -DNDEBUG -DNOPARACHUTE") | |
7 | +elseif(CMAKE_BUILD_TYPE STREQUAL "PLD") | |
8 | + set(WL_OPTIMIZE_FLAGS "") | |
9 | + set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE") | |
10 | else() | |
11 | message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") | |
12 | endif() | |
13 | --- widelands-build19-src/CMakeLists.txt.orig 2017-07-15 17:44:06.607832280 +0200 | |
14 | +++ widelands-build19-src/CMakeLists.txt 2017-07-15 18:59:17.074447445 +0200 | |
15 | @@ -248,7 +248,6 @@ | |
16 | install ( | |
17 | FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION | |
18 | DESTINATION ${WL_INSTALL_BASEDIR} | |
19 | - CONFIGURATIONS Debug;Release | |
20 | COMPONENT CoreVersionFile | |
21 | ) | |
22 | ||
23 | @@ -271,7 +270,6 @@ | |
24 | data/txts | |
25 | data/world | |
26 | DESTINATION ${WL_INSTALL_DATADIR} | |
27 | - CONFIGURATIONS Debug;Release | |
28 | COMPONENT CoreDataFiles | |
29 | ) | |
30 | ||
31 | @@ -279,7 +277,6 @@ | |
32 | DIRECTORY | |
33 | data/maps | |
34 | DESTINATION ${WL_INSTALL_DATADIR} | |
35 | - CONFIGURATIONS Debug;Release | |
36 | COMPONENT MapFiles | |
37 | ) | |
38 | ||
39 | @@ -288,7 +285,6 @@ | |
40 | data/music | |
41 | data/sound | |
42 | DESTINATION ${WL_INSTALL_DATADIR} | |
43 | - CONFIGURATIONS Debug;Release | |
44 | COMPONENT MusicFiles | |
45 | ) | |
46 | ||
47 | @@ -298,7 +294,6 @@ | |
48 | CREDITS | |
49 | ChangeLog | |
50 | DESTINATION ${WL_INSTALL_BASEDIR} | |
51 | - CONFIGURATIONS Debug;Release | |
52 | COMPONENT CoreLicenseFiles | |
53 | ) | |
54 | ||
55 | @@ -317,6 +312,5 @@ | |
56 | DIRECTORY | |
57 | ${CMAKE_CURRENT_BINARY_DIR}/locale/ | |
58 | DESTINATION ${WL_INSTALL_DATADIR}/locale | |
59 | - CONFIGURATIONS Debug;Release | |
60 | COMPONENT CoreLanguageFiles | |
61 | ) | |
62 | --- widelands-build19-src/cmake/WlFunctions.cmake.orig 2016-11-10 08:28:01.000000000 +0100 | |
63 | +++ widelands-build19-src/cmake/WlFunctions.cmake 2017-07-15 20:20:09.604392035 +0200 | |
64 | @@ -276,5 +276,5 @@ | |
65 | ||
66 | #Quoting the CMake documentation on DESTINATION: | |
67 | #"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX" | |
68 | - install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles) | |
69 | + install(TARGETS ${NAME} DESTINATION "bin" COMPONENT ExecutableFiles) | |
70 | endfunction() |