From 3340162efdb9c05132f8dd6bb9a9b225a892a352 Mon Sep 17 00:00:00 2001 From: onqtam Date: Tue, 15 Jan 2019 22:48:37 +0200 Subject: [PATCH] fixing osx builds - had forgotten to define this for the object file where the test runner is compiled --- test/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f314ea66..63b3dd58 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -61,9 +61,13 @@ add_library(doctest_main OBJECT "src/unit.cpp" ) set_target_properties(doctest_main PROPERTIES - COMPILE_DEFINITIONS "$<$:_SCL_SECURE_NO_WARNINGS>" COMPILE_OPTIONS "$<$:/EHsc;$<$:/Od>>" ) +target_compile_definitions(doctest_main PUBLIC + "$<$:_SCL_SECURE_NO_WARNINGS>" + "DOCTEST_THREAD_LOCAL" + "DOCTEST_CONFIG_SUPER_FAST_ASSERTS" +) target_compile_features(doctest_main PUBLIC cxx_std_11) target_include_directories(doctest_main PRIVATE "thirdparty/doctest") @@ -96,10 +100,6 @@ foreach(file ${files}) string(REGEX REPLACE "unit-([^$]+)" "test-\\1" testcase ${file_basename}) add_executable(${testcase} $ ${file}) - target_compile_definitions(${testcase} PRIVATE - DOCTEST_CONFIG_SUPER_FAST_ASSERTS - DOCTEST_THREAD_LOCAL - ) target_compile_options(${testcase} PRIVATE $<$:/EHsc;$<$:/Od>> $<$>:-Wno-deprecated;-Wno-float-equal>