workflows: remove CXX standard overrule, this is controlled by the cmakes internally (#956)

bramoosterhuis · web-flow · commit 153e814da5cc · 2026-03-11T12:24:14.000+01:00
* cmake: Remove direct C/CXX flag manipulation

Strict flags are now inherited via find_package(Thunder) when Thunder
is built with ENABLE_STRICT_COMPILER_SETTINGS=ON, and can be opted out
by setting ENABLE_STRICT_COMPILER_SETTINGS=OFF in a downstream project.

* Update workflow to used the local path

* workflows: remove strict C/CXX flags from the configure

* workflows: remove CXX standard overrule, this is controlled by the cmakes internally

* workflows: fix broken c flag

* cmake: Add cppstd to libraries that were missing it.
diff --git a/.github/workflows/Build ThunderNanoServices on Linux.yml b/.github/workflows/Build ThunderNanoServices on Linux.yml
@@ -20,4 +20,4 @@ jobs:
 
   ThunderNanoServices:
     needs: ThunderInterfaces
-    uses: rdkcentral/ThunderNanoServices/.github/workflows/Linux build template.yml@master
+    uses: ./.github/workflows/Linux build template.yml
diff --git a/.github/workflows/Build ThunderNanoServices on MacOS.yml b/.github/workflows/Build ThunderNanoServices on MacOS.yml
@@ -20,4 +20,4 @@ jobs:
 
   ThunderNanoServices_MacOS:
     needs: ThunderInterfaces_MacOS
-    uses: rdkcentral/ThunderNanoServices/.github/workflows/MacOS build template.yml@master
+    uses: ./.github/workflows/MacOS build template.yml
diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
@@ -98,8 +98,8 @@ jobs:
         source venv/bin/activate
         ${{matrix.architecture == '32' && 'export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:$PKG_CONFIG_PATH' || 'PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH'}}
         cmake -G Ninja -S ThunderNanoServices -B ${{matrix.build_type}}/build/ThunderNanoServices \
-        -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
-        -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
+        -DCMAKE_CXX_FLAGS="-m${{matrix.architecture}}" \
+        -DCMAKE_C_FLAGS="-m${{matrix.architecture}}" \
         -DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
         -DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
         -DEXAMPLE_CLIENT_SERVER=ON \
diff --git a/.github/workflows/MacOS build template.yml b/.github/workflows/MacOS build template.yml
@@ -59,12 +59,8 @@ jobs:
       run: |
         source venv/bin/activate
         cmake -G Ninja -S ThunderNanoServices -B ${{matrix.build_type}}/build/ThunderNanoServices \
-        -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror" \
-        -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror" \
         -DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
         -DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
-        -DCMAKE_CXX_STANDARD=11 \
-        -DCMAKE_CXX_STANDARD_REQUIRED=ON \
         -DEXAMPLE_COMRPCCLIENT=ON \
         -DPLUGIN_CECCONTROL=OFF \
         -DPLUGIN_COMMANDER=ON \
diff --git a/AVS/CMakeLists.txt b/AVS/CMakeLists.txt
@@ -92,7 +92,4 @@ target_link_libraries(${MODULE_NAME}
 install(TARGETS ${MODULE_NAME}
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
-# TODO: remove me ;)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
-
 write_config()
diff --git a/CECControl/simpleworker/CMakeLists.txt b/CECControl/simpleworker/CMakeLists.txt
@@ -34,4 +34,8 @@ target_link_libraries(SimpleWorker
         ${NAMESPACE}Core::${NAMESPACE}Core
         ${NAMESPACE}Definitions::${NAMESPACE}Definitions)
 
+set_target_properties(SimpleWorker PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 add_library(SimpleWorker::SimpleWorker ALIAS SimpleWorker)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,26 +66,6 @@ option(PLUGIN_WEBSHELL "Include WebShell plugin" OFF)
 option(PLUGIN_WIFICONTROL "Include WifiControl plugin" OFF)
 option(PLUGIN_FILETRANSFER "Include FileTransfer plugin" OFF)
 
-
-if(ENABLE_STRICT_COMPILER_SETTINGS)
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        message(FATAL_ERROR "Compiling with Clang")
-        set(CMAKE_STRICT_COMPILER_SETTINGS "-Weverything -Wextra -Wpedantic -Werror")
-        set(CMAKE_STRICT_CXX_COMPILER_SETTINGS "${CMAKE_STRICT_COMPILER_SETTINGS} -Wnon-virtual-dtor")
-    elseif(${CMAKE_COMPILER_IS_GNUCXX})
-        message(STATUS "Compiling with GCC")
-        set(CMAKE_STRICT_COMPILER_SETTINGS "-Wall -Wextra -Wpedantic -Werror")
-        set(CMAKE_STRICT_CXX_COMPILER_SETTINGS "${CMAKE_STRICT_COMPILER_SETTINGS} -Wnon-virtual-dtor")
-    elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-        message(STATUS "Compiling with MS Visual Studio")
-        set(CMAKE_STRICT_COMPILER_SETTINGS "/W4")
-    else()
-        message(STATUS "Compiler ${CMAKE_CXX_COMPILER_ID}")
-    endif()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_STRICT_CXX_COMPILER_SETTINGS}")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_STRICT_COMPILER_SETTINGS}")
-endif()
-
 if(PLUGIN_AVS)
     add_subdirectory(AVS)
 endif()
diff --git a/Cobalt/CMakeLists.txt b/Cobalt/CMakeLists.txt
@@ -54,6 +54,10 @@ add_library(${MODULE_NAME} SHARED
     CobaltJsonRpc.cpp
     Module.cpp)
 
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 add_library(${PLUGIN_COBALT_IMPLEMENTATION} SHARED
     Module.cpp
     CobaltImplementation.cpp)
diff --git a/Compositor/lib/Mesa/renderer/test/simpleworker/CMakeLists.txt b/Compositor/lib/Mesa/renderer/test/simpleworker/CMakeLists.txt
@@ -24,6 +24,10 @@ find_package(${NAMESPACE}Definitions REQUIRED)
 add_library(CompositorSimpleWorker STATIC
     SimpleWorker.cpp)
 
+set_target_properties(CompositorSimpleWorker PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+    
 target_include_directories(CompositorSimpleWorker PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${NAMESPACE}>)
diff --git a/DIALServer/CMakeLists.txt b/DIALServer/CMakeLists.txt
@@ -66,6 +66,10 @@ add_library(${MODULE_NAME} SHARED
     DIALServerJsonRpc.cpp
     Module.cpp)
 
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 if(PLUGIN_DIALSERVER_ENABLE_YOUTUBE AND "${PLUGIN_DIALSERVER_YOUTUBE_MODE}" STREQUAL "active")
     target_sources(${MODULE_NAME}
         PRIVATE
diff --git a/ScriptEngine/CMakeLists.txt b/ScriptEngine/CMakeLists.txt
@@ -36,6 +36,10 @@ add_library(${MODULE_NAME} SHARED
     ScriptEngine.cpp
     Module.cpp)
 
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_link_libraries(${MODULE_NAME} 
     PRIVATE 
         CompileSettingsDebug::CompileSettingsDebug
diff --git a/Spark/CMakeLists.txt b/Spark/CMakeLists.txt
@@ -45,6 +45,10 @@ add_library(${MODULE_NAME} SHARED
     SparkJsonRpc.cpp
     Module.cpp)
 
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 if(PLUGIN_SPARK_NAME)
     target_compile_definitions(${MODULE_NAME} 
         PRIVATE 
diff --git a/Streamer/Implementation/Aamp/CMakeLists.txt b/Streamer/Implementation/Aamp/CMakeLists.txt
@@ -45,5 +45,9 @@ target_link_libraries(${LIB_NAME}
         ${GLIB_GIO_LIBRARIES}
         ${GLIB_LIBRARIES})
 
+set_target_properties(${LIB_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 install(TARGETS ${LIB_NAME}
 	DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${NAMESPACE}_Development)
diff --git a/SwitchBoard/CMakeLists.txt b/SwitchBoard/CMakeLists.txt
@@ -43,6 +43,10 @@ add_library(${MODULE_NAME} SHARED
     SwitchBoard.cpp
     Module.cpp)
 
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_link_libraries(${MODULE_NAME} 
     PRIVATE
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins
diff --git a/WebPA/CMakeLists.txt b/WebPA/CMakeLists.txt
@@ -60,6 +60,10 @@ add_library(${MODULE_NAME} SHARED
     WebPAImplementation.cpp
 )
 
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_compile_definitions(${MODULE_NAME} PRIVATE ${PLUGIN_DEFINITIONS})
 target_include_directories(${MODULE_NAME} PRIVATE ${PLUGIN_INCLUDE_DIRS})
 
diff --git a/WebPA/Clients/CCSP/CMakeLists.txt b/WebPA/Clients/CCSP/CMakeLists.txt
@@ -43,6 +43,10 @@ target_link_libraries(${TARGET}
         SysCfg::SysCfg
 )
 
+set_target_properties(${TARGET} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_compile_definitions(${TARGET} PRIVATE ${PLUGIN_DEFINITIONS})
 target_include_directories(${TARGET} PRIVATE ${PLUGIN_INCLUDE_DIRS})
 
diff --git a/WebPA/Clients/GenericAdapter/CMakeLists.txt b/WebPA/Clients/GenericAdapter/CMakeLists.txt
@@ -41,6 +41,10 @@ add_library(${TARGET} SHARED
     Module.cpp
 )
 
+set_target_properties(${TARGET} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_include_directories(${TARGET}
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}
diff --git a/WebPA/Clients/GenericAdapter/Profiles/Device/CMakeLists.txt b/WebPA/Clients/GenericAdapter/Profiles/Device/CMakeLists.txt
@@ -28,6 +28,10 @@ add_library(${TARGET}
     DeviceInfo.cpp
 )
 
+set_target_properties(${TARGET} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_include_directories(${TARGET}
     PRIVATE
         ../
diff --git a/examples/DynamicLoading/Yang/CMakeLists.txt b/examples/DynamicLoading/Yang/CMakeLists.txt
@@ -49,6 +49,10 @@ add_library(${MODULE_NAME} SHARED
     Yang.cpp
     Module.cpp)
 
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+    
 add_dependencies(${MODULE_NAME}
     ${PLUGIN_YANG_DEFINITIONS})
 
diff --git a/examples/DynamicLoading/Yang/interfaces/CMakeLists.txt b/examples/DynamicLoading/Yang/interfaces/CMakeLists.txt
@@ -42,6 +42,10 @@ add_library(${PLUGIN_YANG_MARSHALLING} SHARED
     ${PROXY_STUB_SOURCES}
     Module.cpp)
 
+set_target_properties(${PLUGIN_YANG_MARSHALLING} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_link_libraries(${PLUGIN_YANG_MARSHALLING}
     PRIVATE
         ${NAMESPACE}Core::${NAMESPACE}Core
diff --git a/examples/DynamicLoading/Yin/CMakeLists.txt b/examples/DynamicLoading/Yin/CMakeLists.txt
@@ -49,6 +49,10 @@ add_library(${MODULE_NAME} SHARED
     Yin.cpp
     Module.cpp)
 
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 add_dependencies(${MODULE_NAME}
     ${PLUGIN_YIN_DEFINITIONS})
 
diff --git a/examples/DynamicLoading/Yin/interfaces/CMakeLists.txt b/examples/DynamicLoading/Yin/interfaces/CMakeLists.txt
@@ -51,6 +51,10 @@ add_library(${PLUGIN_YIN_DEFINITIONS} SHARED
     ${JSON_ENUM_SOURCES}
     Module.cpp)
 
+set_target_properties(${PLUGIN_YIN_DEFINITIONS} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_link_libraries(${PLUGIN_YIN_DEFINITIONS}
     PRIVATE
         ${NAMESPACE}Core::${NAMESPACE}Core
diff --git a/examples/GeneratorShowcase/CMakeLists.txt b/examples/GeneratorShowcase/CMakeLists.txt
@@ -39,6 +39,10 @@ add_library(${MODULE_NAME} SHARED
     GeneratorShowcase.cpp
     Module.cpp)
 
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD ${CXX_STD}
+    CXX_STANDARD_REQUIRED YES)
+
 target_include_directories(${MODULE_NAME} SYSTEM
     PRIVATE
         ".")
