From a7c198f96d077a22f7346d16301c9c85acfdbe5a Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Tue, 20 Dec 2022 22:11:20 +0100 Subject: [PATCH] Updated test cases cxx flags --- tests/CMakeLists.txt | 12 +++++++++--- tests/test_config.cc | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index de133064..8d6a31ac 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,12 +4,18 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_CXX_STANDARD 17) -set(TEST_DISABLE_WARNINGS "-Wno-unused-parameter -Wno-unused-private-field -Wno-unused-variable -Wno-attributes -Wno-nonnull -Wno-aggressive-loop-optimizations") +set(TEST_DISABLE_WARNINGS_DEBUG "-Wno-unused-parameter -Wno-unused-private-field -Wno-unused-variable -Wno-attributes -Wno-nonnull") +set(TEST_DISABLE_WARNINGS_RELEASE "${TEST_DISABLE_WARNINGS} -Wno-aggressive-loop-optimizations") + + +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${LIBCLANG_CXXFLAGS} ${TEST_DISABLE_WARNINGS_RELEASE}") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${LIBCLANG_CXXFLAGS} ${TEST_DISABLE_WARNINGS_DEBUG}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCLANG_CXXFLAGS} ${TEST_DISABLE_WARNINGS}") if(APPLE) # Without this, clang-uml test cases fail with error saying that clang cannot find stdarg.h - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${LLVM_LIBRARY_DIR}/clang/${LLVM_PACKAGE_VERSION}/include") + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${LLVM_LIBRARY_DIR}/clang/${LLVM_PACKAGE_VERSION}/include") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -I${LLVM_LIBRARY_DIR}/clang/${LLVM_PACKAGE_VERSION}/include") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -I${LLVM_LIBRARY_DIR}/clang/${LLVM_PACKAGE_VERSION}/include") endif(APPLE) file(GLOB_RECURSE TEST_CASE_SOURCES t*/*.cc) diff --git a/tests/test_config.cc b/tests/test_config.cc index dc2ed3ba..5887e67d 100644 --- a/tests/test_config.cc +++ b/tests/test_config.cc @@ -154,7 +154,7 @@ TEST_CASE("Test config layout", "[unit-test]") CHECK(cfg.diagrams.size() == 2); - auto &def = static_cast( + [[maybe_unused]] auto &def = static_cast( *cfg.diagrams["class_main"]); auto check_layout = [](const auto &diagram,