diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2020-08-27 22:08:46 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2020-08-27 22:08:46 +0100 |
| commit | de70754fe00d527a888c54e5110aed9d6730df57 (patch) | |
| tree | d67bce240615a92fc1cdf182f002e6c26d635e4b | |
| parent | net-analyzer/nessus-bin: bug #739178 (diff) | |
| download | gentoo-de70754fe00d527a888c54e5110aed9d6730df57.tar.gz gentoo-de70754fe00d527a888c54e5110aed9d6730df57.tar.bz2 gentoo-de70754fe00d527a888c54e5110aed9d6730df57.zip | |
games-engines/odamex: Try to fix patch line endings issue again
Closes: https://bugs.gentoo.org/739186
Closes: https://github.com/gentoo/gentoo/pull/17283
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
| -rw-r--r-- | games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch index 5dd89d1910dd..935d43466c41 100644 --- a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch +++ b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch @@ -13,17 +13,17 @@ index f68a4d4d..4abbe0d8 100644 --- a/odalaunch/CMakeLists.txt +++ b/odalaunch/CMakeLists.txt @@ -32,6 +32,11 @@ endif() - - # Odalaunch target - if(wxWidgets_FOUND) -+ # wxWidgets 3.0.4 requires C++11 -+ if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3) -+ set(CMAKE_CXX_STANDARD 11) -+ endif() -+ - add_custom_command( - OUTPUT ${XRCRES_HEADER} - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res +
+ # Odalaunch target
+ if(wxWidgets_FOUND)
++ # wxWidgets 3.0.4 requires C++11
++ if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3)
++ set(CMAKE_CXX_STANDARD 11)
++ endif()
++
+ add_custom_command(
+ OUTPUT ${XRCRES_HEADER}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res
-- 2.28.0 |