diff options
Diffstat (limited to 'games/widelands/files/patch-CMakeLists.txt')
| -rw-r--r-- | games/widelands/files/patch-CMakeLists.txt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/games/widelands/files/patch-CMakeLists.txt b/games/widelands/files/patch-CMakeLists.txt index eeda6cbe5c97..63e0398f9b2f 100644 --- a/games/widelands/files/patch-CMakeLists.txt +++ b/games/widelands/files/patch-CMakeLists.txt @@ -1,45 +1,45 @@ ---- CMakeLists.txt.orig 2024-03-28 10:12:05 UTC +--- CMakeLists.txt.orig 2024-11-12 20:03:25 UTC +++ CMakeLists.txt -@@ -328,7 +328,7 @@ if(NOT MSVC) +@@ -329,7 +329,7 @@ if(NOT MSVC) endif() if(NOT MSVC) -- if(CMAKE_BUILD_TYPE STREQUAL "Release") -+ if(TRUE OR CMAKE_BUILD_TYPE STREQUAL "Release") +- if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")) ++ if(TRUE OR (CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")) message(STATUS "Compiler warnings will be ignored.") elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND ( ((NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0)) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.2)) -@@ -360,12 +360,12 @@ if(USE_FLTO_IF_AVAILABLE STREQUAL "yes") +@@ -361,12 +361,12 @@ if(USE_FLTO_IF_AVAILABLE STREQUAL "yes") if(USE_FLTO_IF_AVAILABLE STREQUAL "yes") # Cross-compile-unit optimization not supported by gcc with debug on! # Therefore, this may only be done with Release builds. --if(CMAKE_BUILD_TYPE STREQUAL "Release") -+if(TRUE OR CMAKE_BUILD_TYPE STREQUAL "Release") +-if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")) ++if(TRUE OR (CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")) # Only tested on Linux. Might work also on other platforms. # If tested and found good, remove this check - if (CMAKE_SYSTEM MATCHES "Linux") + if (TRUE OR CMAKE_SYSTEM MATCHES "Linux") # Usage of -flto tested only with gcc 8.3 and 9.3 (2020-04); when in doubt, leaving it out.. - if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)) -+ if(TRUE OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)) ++ if(TRUE OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)) # # The execution jumps between compile units rather often. -flot allows optimization across # comple units. Binary size reduced by >15% on tested environments. This does not directly -@@ -479,13 +479,6 @@ endif (OPTION_BUILD_TESTS) +@@ -484,13 +484,6 @@ endif (OPTION_BUILD_TESTS) ) endif (OPTION_BUILD_TESTS) -install ( - FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION - DESTINATION ${WL_INSTALL_BASEDIR} -- CONFIGURATIONS Debug;Release;None +- CONFIGURATIONS Debug;Release;RelWithDebInfo;None - COMPONENT CoreVersionFile -) - - # Installation. - add_subdirectory(doc) - if(OPTION_BUILD_TRANSLATIONS) -@@ -538,10 +531,9 @@ install( + # TODO(Nordfriese): Use this consistently in places in code that use various other tests for endianness + include(TestBigEndian) + TEST_BIG_ENDIAN(IS_BIG_ENDIAN) +@@ -553,10 +546,9 @@ install( install( FILES @@ -48,6 +48,6 @@ ChangeLog - DESTINATION ${WL_INSTALL_BASEDIR} + DESTINATION ${WL_INSTALL_DOCDIR} - CONFIGURATIONS Debug;Release;None + CONFIGURATIONS Debug;Release;RelWithDebInfo;None COMPONENT CoreLicenseFiles ) |