[core] Reduce warnings a little bit

ossia · Aug 30, 2023 · 590c9af · 590c9af
1 parent 48a77a6
commit 590c9af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/cmake/deps/re2.cmake b/cmake/deps/re2.cmake
@@ -7,7 +7,7 @@ if(OSSIA_USE_SYSTEM_LIBRARIES)
   endif()
   add_library(re2 INTERFACE IMPORTED GLOBAL)
   add_library(re2::re2 ALIAS re2)
-  target_include_directories(re2 INTERFACE ${RE2_INCLUDE_DIR})
+  target_include_directories(re2 INTERFACE SYSTEM ${RE2_INCLUDE_DIR})
   target_link_libraries(re2 INTERFACE ${RE2_LIBRARY})
 else()
   add_library(re2 STATIC
@@ -45,9 +45,11 @@ else()
   if(WIN32)
     target_compile_definitions(re2 PRIVATE -DUNICODE -D_UNICODE -DSTRICT -DNOMINMAX)
     target_compile_definitions(re2 PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
+  else()
+    target_compile_options(re2 PRIVATE -w)
   endif()
 
-  target_include_directories(re2 PUBLIC $<BUILD_INTERFACE:${OSSIA_3RDPARTY_FOLDER}/re2>)
+  target_include_directories(re2 PUBLIC SYSTEM $<BUILD_INTERFACE:${OSSIA_3RDPARTY_FOLDER}/re2>)
 
   if(UNIX)
     target_link_libraries(re2 PUBLIC Threads::Threads)

diff --git a/src/ossia/detail/nullable_variant.hpp b/src/ossia/detail/nullable_variant.hpp
@@ -75,12 +75,9 @@ struct nullable_variant
   }
 
   // FIXME is this safe
-  [[deprecated]] OSSIA_MAXIMUM_INLINE constexpr void* target() noexcept { return this; }
+  OSSIA_MAXIMUM_INLINE constexpr void* target() noexcept { return this; }
 
-  [[deprecated]] OSSIA_MAXIMUM_INLINE constexpr const void* target() const noexcept
-  {
-    return this;
-  }
+  OSSIA_MAXIMUM_INLINE constexpr const void* target() const noexcept { return this; }
 };
 
 /*