[cmake] Use list syntax of CXX_COMPILER_ID generator expression.

MaterialLib/SolidModels/MFront/CMakeLists.txt

@@ -31,10 +31,8 @@ target_link_libraries(
 
 # Disable warnings for generated OgsMFrontBehaviour
 target_compile_options(
-    OgsMFrontBehaviour
-    PRIVATE
-        $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:-w>
-        $<$<CXX_COMPILER_ID:MSVC>:/W0>
+    OgsMFrontBehaviour PRIVATE $<$<CXX_COMPILER_ID:Clang,AppleClang,GNU>:-w>
+                               $<$<CXX_COMPILER_ID:MSVC>:/W0>
 )
 
 target_include_directories(

scripts/cmake/Dependencies.cmake

@@ -456,10 +456,8 @@ if(WIN32 AND VTK_ADDED)
 endif()
 foreach(target ${DISABLE_WARNINGS_TARGETS})
     target_compile_options(
-        ${target}
-        PRIVATE
-            $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:-w>
-            $<$<CXX_COMPILER_ID:MSVC>:/W0>
+        ${target} PRIVATE $<$<CXX_COMPILER_ID:Clang,AppleClang,GNU>:-w>
+                          $<$<CXX_COMPILER_ID:MSVC>:/W0>
     )
 endforeach()
 

scripts/cmake/Functions.cmake

@@ -96,19 +96,8 @@ function(ogs_add_library targetName)
     add_library(${targetName} ${type} ${files})
     target_compile_options(
         ${targetName}
-        PRIVATE # OR does not work with cotire
-                # $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,
-                # $<CXX_COMPILER_ID:GNU>>:-Wall -Wextra>
-                $<$<CXX_COMPILER_ID:Clang>:-Wall
-                -Wextra
-                -Wunreachable-code>
-                $<$<CXX_COMPILER_ID:AppleClang>:-Wall
-                -Wextra
-                -Wunreachable-code>
-                $<$<CXX_COMPILER_ID:GNU>:-Wall
-                -Wextra
-                -Wunreachable-code>
-                $<$<CXX_COMPILER_ID:MSVC>:/W3>
+        PRIVATE $<$<CXX_COMPILER_ID:Clang,AppleClang,GNU>:-Wall -Wextra
+                -Wunreachable-code> $<$<CXX_COMPILER_ID:MSVC>:/W3>
     )
 
     if(BUILD_SHARED_LIBS)
@@ -120,7 +109,9 @@ function(ogs_add_library targetName)
     if(ogs_add_library_GENERATE_EXPORT_HEADER)
         include(GenerateExportHeader)
         generate_export_header(${targetName})
-        target_include_directories(${targetName} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+        target_include_directories(
+            ${targetName} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
+        )
     endif()
 
     if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.16)
@@ -144,19 +135,8 @@ function(ogs_add_executable targetName)
 
     target_compile_options(
         ${targetName}
-        PRIVATE # OR does not work with cotire
-                # $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,
-                # $<CXX_COMPILER_ID:GNU>>:-Wall -Wextra>
-                $<$<CXX_COMPILER_ID:Clang>:-Wall
-                -Wextra
-                -Wunreachable-code>
-                $<$<CXX_COMPILER_ID:AppleClang>:-Wall
-                -Wextra
-                -Wunreachable-code>
-                $<$<CXX_COMPILER_ID:GNU>:-Wall
-                -Wextra
-                -Wunreachable-code>
-                $<$<CXX_COMPILER_ID:MSVC>:/W3>
+        PRIVATE $<$<CXX_COMPILER_ID:Clang,AppleClang,GNU>:-Wall -Wextra
+                -Wunreachable-code> $<$<CXX_COMPILER_ID:MSVC>:/W3>
     )
 endfunction()