app-editors/imhex: update patches
This commit is contained in:
parent
bbcbe77d1e
commit
d5afedbc9a
1 changed files with 15 additions and 14 deletions
|
@ -1,23 +1,24 @@
|
||||||
Remove -Werror where we can not control it using flags
|
diff --git a/lib/external/pattern_language/cli/CMakeLists.txt b/lib/external/pattern_language/cli/CMakeLists.txt
|
||||||
https://bugs.gentoo.org/921663
|
index 163eded..fcf7dd2 100644
|
||||||
Submodule lib/external/pattern_language contains modified content
|
|
||||||
--- a/lib/external/pattern_language/cli/CMakeLists.txt
|
--- a/lib/external/pattern_language/cli/CMakeLists.txt
|
||||||
+++ b/lib/external/pattern_language/cli/CMakeLists.txt
|
+++ b/lib/external/pattern_language/cli/CMakeLists.txt
|
||||||
@@ -29,7 +29,7 @@ else()
|
@@ -32,7 +32,7 @@ else()
|
||||||
find_package(CLI11 CONFIG QUIET)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-target_compile_options(plcli PRIVATE -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-array-bounds)
|
|
||||||
+target_compile_options(plcli PRIVATE -Wall -Wextra -Wno-unknown-pragmas -Wno-array-bounds)
|
|
||||||
target_include_directories(plcli PUBLIC include ${CLI11_INCLUDE_DIRS})
|
|
||||||
target_link_libraries(plcli PRIVATE ${CLI11_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} libpl libpl-gen ${FMT_LIBRARIES})
|
|
||||||
|
|
||||||
--- a/lib/external/pattern_language/lib/CMakeLists.txt
|
|
||||||
+++ b/lib/external/pattern_language/lib/CMakeLists.txt
|
|
||||||
@@ -86,7 +86,7 @@ if (LIBPL_ENABLE_PRECOMPILED_HEADERS)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
|
||||||
|
- target_compile_options(plcli PRIVATE -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-array-bounds)
|
||||||
|
+ target_compile_options(plcli PRIVATE -Wall -Wextra -Wno-unknown-pragmas -Wno-array-bounds)
|
||||||
|
endif()
|
||||||
|
target_include_directories(plcli PUBLIC include ${CLI11_INCLUDE_DIRS})
|
||||||
|
target_link_libraries(plcli PRIVATE ${CLI11_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} libwolv libpl_includes libpl-gen ${FMT_LIBRARIES})
|
||||||
|
diff --git a/lib/external/pattern_language/lib/CMakeLists.txt b/lib/external/pattern_language/lib/CMakeLists.txt
|
||||||
|
index 29cbf1e..415eff4 100644
|
||||||
|
--- a/lib/external/pattern_language/lib/CMakeLists.txt
|
||||||
|
+++ b/lib/external/pattern_language/lib/CMakeLists.txt
|
||||||
|
@@ -90,7 +90,7 @@ endif ()
|
||||||
|
if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||||
|
target_compile_options(libpl PRIVATE /EHsc)
|
||||||
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
|
||||||
- target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
|
- target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
|
||||||
+ target_compile_options(libpl PRIVATE -Wall -Wextra -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
|
+ target_compile_options(libpl PRIVATE -Wall -Wextra -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
|
||||||
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue