From c49a8e21031425f1d03dcedd6b86ff46f6a206e8 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 20 Mar 2025 17:33:26 +0100 Subject: [PATCH] build: setting of "-Wno-unused-result" flag moved to a different CMake file --- CMakeLists.txt | 7 ------- src/core/CMakeLists.txt | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7d28817..711136c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,10 +84,3 @@ endif() # add unit tests enable_testing() add_subdirectory(test) - -# TODO remove this hack when clang-20.2 is released -if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 20 - AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 20.2 -) - target_compile_options(mp-units-core PUBLIC "-Wno-unused-result") -endif() diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 73a8dc65..834d1d35 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -156,6 +156,15 @@ target_compile_definitions( ${projectPrefix}HOSTED=$> ) + +# TODO remove this hack when clang-20.2 is released +if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 20 + AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 20.2 +) + target_compile_options(mp-units-core ${${projectPrefix}TARGET_SCOPE} "-Wno-unused-result") +endif() + +# time-trace if(${projectPrefix}DEV_TIME_TRACE STREQUAL "ALL") target_compile_options(mp-units-core ${${projectPrefix}TARGET_SCOPE} "-ftime-trace") elseif(${projectPrefix}DEV_TIME_TRACE STREQUAL "MODULES")