From e62b1b15dbc3d7d1e9e148f96701c78ecb7cc0ef Mon Sep 17 00:00:00 2001 From: Alice Date: Mon, 9 Nov 2026 15:49:51 +0100 Subject: [PATCH] treat qwt headers as system headers to silence warnings --- CMakeLists.txt | 7 +++++-- libs/qwt/CMakeLists.txt | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ef44da45..41ee30021 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,11 @@ set(PROJECT_VERSION ${PROJECT_VERSION_STRING}) add_compile_definitions(SLS_DET_VERSION="${PROJECT_VERSION}") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) + +if(NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +endif() cmake_policy(SET CMP0074 NEW) diff --git a/libs/qwt/CMakeLists.txt b/libs/qwt/CMakeLists.txt index 56b2635d2..be7986822 100644 --- a/libs/qwt/CMakeLists.txt +++ b/libs/qwt/CMakeLists.txt @@ -38,7 +38,7 @@ find_package(Qt5 REQUIRED file(GLOB QWT_SOURCES ${QWTBASE}src/*.cpp) file(GLOB QWT_HEADERS ${QWTBASE}src/*.h) add_library(qwt STATIC ${QWT_SOURCES} ${QWT_HEADERS} ) -target_include_directories(qwt PUBLIC +target_include_directories(qwt SYSTEM PUBLIC $ ) @@ -54,4 +54,4 @@ target_link_libraries(qwt PUBLIC # Disable all warnings in QWT since we don’t want to patch the library -target_compile_options(qwt PRIVATE -w) \ No newline at end of file +target_compile_options(qwt PRIVATE -w)