libunicode: 0.7.0 -> 0.9.0
This commit is contained in:
@@ -21,13 +21,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libunicode";
|
||||
version = "0.7.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "contour-terminal";
|
||||
repo = "libunicode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J8qawT1oiUO9xTVEMQvsY0K2NtIfkUq9PoCbFt6wqek=";
|
||||
hash = "sha256-EBu8zn5XritudZmBvQmjOmU08XLjhyKI6hVCrnWoR6k=";
|
||||
};
|
||||
|
||||
# Fix: set_target_properties Can not find target to add properties to: Catch2, et al.
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
diff --git a/src/libunicode/CMakeLists.txt b/src/libunicode/CMakeLists.txt
|
||||
index bb1a824..166834c 100644
|
||||
index 25abbd1..99f8b8d 100644
|
||||
--- a/src/libunicode/CMakeLists.txt
|
||||
+++ b/src/libunicode/CMakeLists.txt
|
||||
@@ -235,10 +235,10 @@ if(LIBUNICODE_TESTING)
|
||||
# supress conversion warnings for Catch2
|
||||
@@ -317,10 +317,10 @@ if(LIBUNICODE_TESTING)
|
||||
if(NOT Catch2_FOUND)
|
||||
# Suppress all warnings for embedded third-party Catch2.
|
||||
# https://github.com/catchorg/Catch2/issues/2583
|
||||
# https://github.com/SFML/SFML/blob/e45628e2ebc5843baa3739781276fa85a54d4653/test/CMakeLists.txt#L18-L22
|
||||
- set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF)
|
||||
- set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
|
||||
- suppress_thirdparty_warnings(Catch2)
|
||||
- suppress_thirdparty_warnings(Catch2WithMain)
|
||||
- get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES)
|
||||
- target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS})
|
||||
+ # set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF)
|
||||
+ # set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
|
||||
+ # suppress_thirdparty_warnings(Catch2)
|
||||
+ # suppress_thirdparty_warnings(Catch2WithMain)
|
||||
+ # get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES)
|
||||
+ # target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS})
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user