]>
Commit | Line | Data |
---|---|---|
a9828edf JB |
1 | --- widelands-build21/CMakeLists.txt.orig 2020-07-12 21:33:44.000000000 +0200 |
2 | +++ widelands-build21/CMakeLists.txt 2020-07-28 21:55:52.652415900 +0200 | |
3 | @@ -201,6 +201,10 @@ | |
4 | endif () | |
5 | set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE") | |
6 | option(OPTION_ASAN "Build with AddressSanitizer" ON) | |
20d6b224 JB |
7 | +elseif(CMAKE_BUILD_TYPE STREQUAL "PLD") |
8 | + set(WL_OPTIMIZE_FLAGS "") | |
9 | + set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE") | |
a9828edf | 10 | + option(OPTION_ASAN "Build with AddressSanitizer" OFF) |
20d6b224 JB |
11 | else() |
12 | message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") | |
13 | endif() | |
a9828edf | 14 | @@ -353,7 +357,6 @@ |
20d6b224 JB |
15 | install ( |
16 | FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION | |
17 | DESTINATION ${WL_INSTALL_BASEDIR} | |
18 | - CONFIGURATIONS Debug;Release | |
19 | COMPONENT CoreVersionFile | |
20 | ) | |
21 | ||
a9828edf | 22 | @@ -378,7 +381,6 @@ |
20d6b224 JB |
23 | data/txts |
24 | data/world | |
25 | DESTINATION ${WL_INSTALL_DATADIR} | |
26 | - CONFIGURATIONS Debug;Release | |
27 | COMPONENT CoreDataFiles | |
28 | ) | |
29 | ||
a9828edf | 30 | @@ -386,7 +388,6 @@ |
20d6b224 JB |
31 | DIRECTORY |
32 | data/maps | |
33 | DESTINATION ${WL_INSTALL_DATADIR} | |
34 | - CONFIGURATIONS Debug;Release | |
35 | COMPONENT MapFiles | |
36 | ) | |
37 | ||
a9828edf | 38 | @@ -395,7 +396,6 @@ |
20d6b224 JB |
39 | data/music |
40 | data/sound | |
41 | DESTINATION ${WL_INSTALL_DATADIR} | |
42 | - CONFIGURATIONS Debug;Release | |
43 | COMPONENT MusicFiles | |
44 | ) | |
45 | ||
a9828edf | 46 | @@ -405,7 +405,6 @@ |
20d6b224 JB |
47 | CREDITS |
48 | ChangeLog | |
49 | DESTINATION ${WL_INSTALL_BASEDIR} | |
50 | - CONFIGURATIONS Debug;Release | |
51 | COMPONENT CoreLicenseFiles | |
52 | ) | |
53 | ||
a9828edf | 54 | @@ -424,7 +423,6 @@ |
20d6b224 JB |
55 | DIRECTORY |
56 | ${CMAKE_CURRENT_BINARY_DIR}/locale/ | |
57 | DESTINATION ${WL_INSTALL_DATADIR}/locale | |
58 | - CONFIGURATIONS Debug;Release | |
59 | COMPONENT CoreLanguageFiles | |
60 | ) | |
a9828edf | 61 | |
20d6b224 JB |
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() |