chore: bump libcbor to 2024-04-12 master + patches

thewtex · Apr 12, 2024 · 9daf703 · 9daf703
1 parent f25f608
commit 9daf703
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,8 +74,8 @@ FetchContent_Declare(
 
 set(libcbor_GIT_REPOSITORY "https://github.com/PJK/libcbor")
 set(libcbor_GIT_REPOSITORY "https://github.com/thewtex/libcbor")
-# 2022-12-17 master + CMake + WASI + target_include_directory + GCC | operator warning
-set(libcbor_GIT_TAG "702568cd2d60f3b9fb2d491c274ab03b8c1b1bf9")
+# 2024-04-12 master + CMake + WASI + target_include_directory + GCC | operator warning + GCC Return type warning
+set(libcbor_GIT_TAG "d408d5e3d45f2414f6378b20a6395faa5a431724")
 FetchContent_Declare(
   libcbor
   GIT_REPOSITORY ${libcbor_GIT_REPOSITORY}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -26,6 +26,12 @@ set(WebAssemblyInterface_SRCS
   )
 itk_module_add_library(WebAssemblyInterface ${WebAssemblyInterface_SRCS})
 target_link_libraries(WebAssemblyInterface LINK_PUBLIC cbor cpp-base64)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  target_compile_options(WebAssemblyInterface PRIVATE "-Wno-unused-result")
+endif()
+if(MSVC)
+  target_link_options(WebAssemblyInterface PRIVATE "/ignore:4715")
+endif()
 
 if(BUILD_ITK_WASM_IO_MODULES)