Refactor warnings and extra args cache variables

Author: DownerCase

CMakeLists.txt

@@ -202,13 +202,23 @@ option(ECAL_INSTALL_SAMPLE_SOURCES                  "Install the sources of eCAL
 option(ECAL_USE_NPCAP                               "Enable the eCAL Npcap Receiver (i.e. the Win10 performance fix)"  OFF)
 option(ECAL_USE_CLOCKLOCK_MUTEX                     "Use native mutex with monotonic clock (requires glibc >= 2.30)"   OFF)
 
-set(ECAL_EXTRA_COMPILER_ARGS "" CACHE STRING "; separated list of additional compiler arguments to use for eCAL code")
-include(./cmake/helper_functions/ecal_compiler_warnings.cmake)
+
+# Compiler warnings and additional flag configuration
+include(${CMAKE_CURRENT_LIST_DIR}/cmake/helper_functions/ecal_compiler_warnings.cmake)
 ecal_get_default_compiler_warnings(ecal_default_warnings)
-list(APPEND ecal_default_warnings ${ECAL_EXTRA_COMPILER_ARGS})
-set(ECAL_COMPILER_WARNINGS "${ecal_default_warnings}" CACHE STRING "Warning flags used for eCAL code")
+
+set(ECAL_COMPILER_WARNINGS "${ecal_default_warnings}" CACHE STRING "List of warning flags for eCAL code")
 mark_as_advanced(FORCE ECAL_COMPILER_WARNINGS)
 
+set(ECAL_COMPILER_EXTRA_ARGS "" CACHE STRING "List of additional compiler arguments for eCAL code")
+mark_as_advanced(FORCE ECAL_COMPILER_EXTRA_ARGS)
+
+# Internal cache variable combining the warning and extra flags
+set(ECAL_COMPILER_ARGS
+  ${ECAL_COMPILER_WARNINGS} ${ECAL_COMPILER_EXTRA_ARGS}
+  CACHE INTERNAL "Compiler flags used for eCAL code" FORCE
+)
+
 # --------------------------------------------------------
 # ecal core configuration
 # --------------------------------------------------------

cmake/helper_functions/ecal_add_functions.cmake

@@ -19,14 +19,14 @@
 include_guard(GLOBAL)
 
 # ECAL_COMPILER_WARNINGS is set by the root CMakeLists and may be user customized
-add_library(_ecal_warnings INTERFACE)
-target_compile_options(_ecal_warnings INTERFACE
-  "$<$<COMPILE_LANGUAGE:C,CXX>:${ECAL_COMPILER_WARNINGS}>"
+add_library(_ecal_compiler_args INTERFACE)
+target_compile_options(_ecal_compiler_args INTERFACE
+  "$<$<COMPILE_LANGUAGE:C,CXX>:${ECAL_COMPILER_ARGS}>"
 )
 
-function(ecal_add_compiler_warnings TARGET_NAME)
+function(ecal_add_compiler_flags TARGET_NAME)
   target_link_libraries("${TARGET_NAME}" PRIVATE
-    "$<BUILD_INTERFACE:_ecal_warnings>"
+    "$<BUILD_INTERFACE:_ecal_compiler_args>"
   )
 endfunction()
 
@@ -38,7 +38,7 @@ function(ecal_add_app_console TARGET_NAME)
     VERSION ${eCAL_VERSION_STRING}
     SOVERSION ${eCAL_VERSION_MAJOR}
     OUTPUT_NAME ecal_${TARGET_NAME})
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 
 # This helper function automatically adds a gtest to ecal.
@@ -65,7 +65,7 @@ function(ecal_add_gtest TARGET_NAME)
     VERSION ${eCAL_VERSION_STRING}
     SOVERSION ${eCAL_VERSION_MAJOR}
     OUTPUT_NAME ecal_${TARGET_NAME})
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 
 function(ecal_add_app_gui TARGET_NAME)
@@ -75,7 +75,7 @@ function(ecal_add_app_gui TARGET_NAME)
     VERSION ${eCAL_VERSION_STRING}
     SOVERSION ${eCAL_VERSION_MAJOR}
     OUTPUT_NAME ecal_${TARGET_NAME})
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 
 function(ecal_add_app_qt TARGET_NAME)
@@ -87,7 +87,7 @@ function(ecal_add_app_qt TARGET_NAME)
   if(WIN32)
     set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
   endif()
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 
 function(ecal_add_mon_plugin TARGET_NAME)
@@ -112,7 +112,7 @@ function(ecal_add_mon_plugin TARGET_NAME)
       $<$<CONFIG:RelWithDebInfo>:QT_NO_DEBUG>
       $<$<CONFIG:MinSizeRel>:QT_NO_DEBUG>
   )
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 
 function(ecal_add_rec_addon TARGET_NAME)
@@ -123,7 +123,7 @@ function(ecal_add_rec_addon TARGET_NAME)
     OUTPUT_NAME ecal_${TARGET_NAME}
     RUNTIME_OUTPUT_DIRECTORY $<IF:$<BOOL:${WIN32}>,${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/ecalrec_addons,${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ecal/addons/rec>
   )
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 
 function(ecal_add_time_plugin TARGET_NAME)
@@ -132,7 +132,7 @@ function(ecal_add_time_plugin TARGET_NAME)
     VERSION ${eCAL_VERSION_STRING}
     SOVERSION ${eCAL_VERSION_MAJOR}
   )
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 
 function(ecal_add_shared_library TARGET_NAME)
@@ -141,7 +141,7 @@ function(ecal_add_shared_library TARGET_NAME)
     VERSION ${eCAL_VERSION_STRING}
     SOVERSION ${eCAL_VERSION_MAJOR}
     OUTPUT_NAME ecal_${TARGET_NAME})
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 
 function(ecal_add_static_library TARGET_NAME)
@@ -152,7 +152,7 @@ function(ecal_add_static_library TARGET_NAME)
     OUTPUT_NAME ecal_${TARGET_NAME}
     POSITION_INDEPENDENT_CODE ON
   )
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 
 function(ecal_add_interface_library TARGET_NAME)
@@ -173,6 +173,6 @@ function(ecal_add_sample TARGET_NAME)
     VERSION ${eCAL_VERSION_STRING}
     SOVERSION ${eCAL_VERSION_MAJOR}
     OUTPUT_NAME ecal_sample_${TARGET_NAME})
-  ecal_add_compiler_warnings(${TARGET_NAME})
+  ecal_add_compiler_flags(${TARGET_NAME})
 endfunction()
 

ecal/service/CMakeLists.txt

@@ -19,10 +19,10 @@
 cmake_minimum_required(VERSION 3.16)
 project(ecal_service)
 
-if(TARGET _ecal_warnings)
-  # _ecal_warnings is the internal eCAL target containing the warning flags
+if(TARGET _ecal_compiler_args)
+  # _ecal_compiler_args is the internal eCAL target containing the warning flags
   # and will be absent if this is being built standalone
-  add_library(_ecal_service_warnings ALIAS _ecal_warnings)
+  add_library(_ecal_service_warnings ALIAS _ecal_compiler_args)
 else()
   # Otherwise, use a fallback implementation
   if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")