From 148f0dda18e556b90299e4f5a3da2c899fb2cac3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 14 Feb 2024 19:17:57 +0000 Subject: [PATCH 8/8] Make valgrind optional for riscv64 --- CMakeLists.txt | 2 ++ test/unittest/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ceda71b1..9d6a49a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,8 @@ if(CCACHE_FOUND) endif() endif(CCACHE_FOUND) +find_program(VALGRIND_FOUND valgrind) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror") if (RAPIDJSON_BUILD_CXX11) diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt index b3204d6c..aae901bc 100644 --- a/test/unittest/CMakeLists.txt +++ b/test/unittest/CMakeLists.txt @@ -77,7 +77,7 @@ add_test(NAME unittest COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) -if(NOT MSVC) +if(NOT MSVC AND VALGRIND_FOUND) # Not running SIMD.* unit test cases for Valgrind add_test(NAME valgrind_unittest COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.* -- 2.43.0