From 805d88daa603d2c7bba8c1960fd68b91f4d5c63e Mon Sep 17 00:00:00 2001 From: "Novak M Mr (UG - Computer Science)" <mn00272@surrey.ac.uk> Date: Mon, 19 Nov 2018 17:36:16 +0000 Subject: [PATCH] Set C++17 explicitly in tests for OSX compilation --- tests/CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 500304d..ffdda56 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,6 +17,14 @@ foreach(FILENAME ${TESTS}) set_target_properties(${TEST_PROJ} PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE") endif() + if(OSX) + set_property(TARGET ${TEST_PROJ} PROPERTY CXX_STANDARD 1z) + elseif(UNIX) + set_property(TARGET ${TEST_PROJ} PROPERTY CXX_STANDARD 17) + elseif(MSVC) + set_property(TARGET ${TEST_PROJ} PROPERTY CXX_STANDARD 17) + endif() + set_property(TARGET ${TEST_PROJ} PROPERTY FOLDER "com3001/tests") add_test(NAME ${TEST_PROJ} COMMAND ${TEST_PROJ}) @@ -28,4 +36,4 @@ foreach(FILENAME ${TESTS}) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${file_i} $<TARGET_FILE_DIR:${TEST_PROJ}>) endforeach(file_i) -endforeach(FILENAME) \ No newline at end of file +endforeach(FILENAME) -- GitLab