From 3e074a3fba92b91a46307dba371af4383502f8f4 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 25 Nov 2025 18:49:18 +0100 Subject: [PATCH] tests: Use standard way of setting cmake variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub Jelen Reviewed-by: Pavol Žáčik Reviewed-by: Andreas Schneider --- tests/CMakeLists.txt | 6 ++---- tests/tests_config.h.cmake | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cdb3ea77..60604110 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -58,8 +58,8 @@ if (SK_DUMMY_LIBRARY) add_library(sk-dummy SHARED IMPORTED) set_target_properties(sk-dummy PROPERTIES IMPORTED_LOCATION "${SK_DUMMY_LIBRARY}") target_link_libraries(${TORTURE_LIBRARY} PRIVATE sk-dummy) - target_compile_definitions(${TORTURE_LIBRARY} PUBLIC HAVE_SK_DUMMY) - target_compile_definitions(${TORTURE_LIBRARY} PUBLIC SK_DUMMY_LIBRARY_PATH="${SK_DUMMY_LIBRARY}") + set(HAVE_SK_DUMMY 1) + set(SK_DUMMY_LIBRARY_PATH ${SK_DUMMY_LIBRARY}) endif() if (WITH_COVERAGE) @@ -109,8 +109,6 @@ if (CLIENT_TESTING) # Link sk-dummy to torture_shared library if available if (SK_DUMMY_LIBRARY) target_link_libraries(${TORTURE_SHARED_LIBRARY} PRIVATE sk-dummy) - target_compile_definitions(${TORTURE_SHARED_LIBRARY} PUBLIC HAVE_SK_DUMMY) - target_compile_definitions(${TORTURE_SHARED_LIBRARY} PUBLIC SK_DUMMY_LIBRARY_PATH="${SK_DUMMY_LIBRARY}") endif (SK_DUMMY_LIBRARY) target_compile_options(${TORTURE_SHARED_LIBRARY} PRIVATE diff --git a/tests/tests_config.h.cmake b/tests/tests_config.h.cmake index 20572af7..3b06025e 100644 --- a/tests/tests_config.h.cmake +++ b/tests/tests_config.h.cmake @@ -82,3 +82,5 @@ #cmakedefine TIMEOUT_EXECUTABLE "${TIMEOUT_EXECUTABLE}" #cmakedefine SOFTHSM2_LIBRARY "${SOFTHSM2_LIBRARY}" #cmakedefine PKCS11SPY "${PKCS11SPY}" +#cmakedefine HAVE_SK_DUMMY 1 +#cmakedefine SK_DUMMY_LIBRARY_PATH "${SK_DUMMY_LIBRARY_PATH}"