Browse Source

build system: suppress deprecated warnings

Michele Caini 6 years ago
parent
commit
79ecfa2573
2 changed files with 13 additions and 6 deletions
  1. 2 2
      CMakeLists.txt
  2. 11 4
      test/CMakeLists.txt

+ 2 - 2
CMakeLists.txt

@@ -93,8 +93,8 @@ target_compile_definitions(
 )
 )
 
 
 if(USE_ASAN)
 if(USE_ASAN)
-    target_compile_options(EnTT INTERFACE $<$<AND:$<CONFIG:Debug>,$<NOT:$<PLATFORM_ID:Windows>>>:-fsanitize=address -fno-omit-frame-pointer>)
-    target_link_libraries(EnTT INTERFACE $<$<AND:$<CONFIG:Debug>,$<NOT:$<PLATFORM_ID:Windows>>>:-fsanitize=address -fno-omit-frame-pointer>)
+    target_compile_options(EnTT INTERFACE $<$<CONFIG:Debug>:-fsanitize=address -fno-omit-frame-pointer>)
+    target_link_libraries(EnTT INTERFACE $<$<CONFIG:Debug>:-fsanitize=address -fno-omit-frame-pointer>)
 endif()
 endif()
 
 
 if(HAS_LIBCPP)
 if(HAS_LIBCPP)

+ 11 - 4
test/CMakeLists.txt

@@ -38,10 +38,17 @@ function(SETUP_TARGET TARGET_NAME)
     target_compile_options(
     target_compile_options(
         ${TARGET_NAME}
         ${TARGET_NAME}
         PRIVATE
         PRIVATE
-            $<$<AND:$<CONFIG:Debug>,$<NOT:$<PLATFORM_ID:Windows>>>:-O0 -g -pedantic -Wall -Wshadow -fvisibility=hidden>
-            $<$<AND:$<CONFIG:Release>,$<NOT:$<PLATFORM_ID:Windows>>>:-O2 -pedantic -Wall -Wshadow -fvisibility=hidden>
-            $<$<AND:$<CONFIG:Debug>,$<PLATFORM_ID:Windows>>:/EHsc /W1>
-            $<$<AND:$<CONFIG:Release>,$<PLATFORM_ID:Windows>>:/EHsc /W1 /O2>
+            $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-pedantic -fvisibility=hidden -Wall -Wshadow -Wno-deprecated-declarations>
+            $<$<CXX_COMPILER_ID:MSVC>:/EHsc /W1 /wd4996>
+    )
+
+    target_compile_options(
+        ${TARGET_NAME}
+        PRIVATE
+            $<$<AND:$<CONFIG:Debug>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:-O0 -g>
+            $<$<AND:$<CONFIG:Release>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:-O2>
+            $<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:MSVC>>:/Od>
+            $<$<AND:$<CONFIG:Release>,$<CXX_COMPILER_ID:MSVC>>:/O2>
     )
     )
 endfunction()
 endfunction()