Merge pull request #708 from hvdijk/compile-warning-as-error

For CMake 3.24+, use COMPILE_WARNINGS_AS_ERRORS.

Author: hvdijk

cmake/AddCA.cmake

@@ -148,11 +148,22 @@ add_compile_options(
   $<$<CXX_COMPILER_ID:Clang,AppleClang>:-fcolor-diagnostics>
   $<$<CXX_COMPILER_ID:GNU>:-fdiagnostics-color=always>)
 
-set(CA_COMPILE_OPTIONS
+# Enable warnings as errors when not a subproject
+set(CA_COMPILE_WARNING_AS_ERROR OFF)
+if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+  set(CA_COMPILE_WARNING_AS_ERROR ON)
+endif()
+
+set(CA_COMPILE_OPTIONS)
+
+if(CA_COMPILE_WARNING_AS_ERROR AND CMAKE_VERSION VERSION_LESS "3.24")
+  list(APPEND CA_COMPILE_OPTIONS
+    $<$<OR:$<BOOL:${UNIX}>,$<BOOL:${ANDROID}>,$<BOOL:${MINGW}>>:-Werror>
+  )
+endif()
+
+list(APPEND CA_COMPILE_OPTIONS
   $<$<OR:$<BOOL:${UNIX}>,$<BOOL:${ANDROID}>,$<BOOL:${MINGW}>>:
-    $<$<STREQUAL:${CMAKE_SOURCE_DIR},${PROJECT_SOURCE_DIR}>:
-      -Werror             # Enable warnings as errors when not a subproject
-    >
     -Wno-error=deprecated-declarations  # Disable: use of deprecated functions
     -Wno-error=array-bounds  # Disable errors that vary heavily on compiler and
     -Wno-error=uninitialized # optimization level and have false positives.
@@ -483,6 +494,8 @@ macro(add_ca_library)
     PRIVATE ${CA_COMPILE_OPTIONS})
   target_compile_definitions(${ARGV0}
     PRIVATE ${CA_COMPILE_DEFINITIONS} ${CA_COMPILER_COMPILE_DEFINITIONS})
+  set_target_properties(${ARGV0} PROPERTIES
+    COMPILE_WARNING_AS_ERROR ${CA_COMPILE_WARNING_AS_ERROR})
   set_ca_target_output_directory(${ARGV0})
   if(COMMAND add_ca_tidy)
     add_ca_tidy(${ACL_UNPARSED_ARGUMENTS} DEPENDS ${ACL_DEPENDS})
@@ -509,6 +522,8 @@ macro(add_ca_interface_library)
     INTERFACE ${CA_COMPILE_OPTIONS})
   target_compile_definitions(${ARGV0}
     INTERFACE ${CA_COMPILE_DEFINITIONS} ${CA_COMPILER_COMPILE_DEFINITIONS})
+  set_target_properties(${ARGV0} PROPERTIES
+    COMPILE_WARNING_AS_ERROR ${CA_COMPILE_WARNING_AS_ERROR})
 endmacro()
 
 #[=======================================================================[.rst:
@@ -569,6 +584,7 @@ macro(add_ca_executable)
   target_compile_definitions(${ARGV0}
     PRIVATE ${CA_COMPILE_DEFINITIONS} ${CA_COMPILER_COMPILE_DEFINITIONS})
   set_target_properties(${ARGV0} PROPERTIES
+    COMPILE_WARNING_AS_ERROR ${CA_COMPILE_WARNING_AS_ERROR}
     RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
   if(COMMAND add_ca_tidy)
     add_ca_tidy(${ACE_UNPARSED_ARGUMENTS} DEPENDS ${ACE_DEPENDS})

modules/compiler/builtins/libimg/CMakeLists.txt

@@ -88,6 +88,8 @@ target_include_directories(image_library_host SYSTEM PUBLIC
   "${CODEPLAY_IMG_OPENCL_INCLUDE_DIR}")
 target_compile_options(image_library_host
   PRIVATE ${CA_COMPILE_OPTIONS})
+set_target_properties(image_library_host PROPERTIES
+  COMPILE_WARNING_AS_ERROR ${CA_COMPILE_WARNING_AS_ERROR})
 
 target_compile_definitions(image_library_host
   PUBLIC CL_TARGET_OPENCL_VERSION=${CA_CL_STANDARD_INTERNAL}