Skip to content
Snippets Groups Projects
Commit 5ce78575 authored by Markus Blatt's avatar Markus Blatt
Browse files

[Merge][CMake] Revert patch 7252 and block patch r6807

Initial message was : Reflect removed test-stack in CMakeLists.txt.

[[Imported from SVN: r7358]]
parent 00e09f58
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,7 @@ set(TESTS ...@@ -30,6 +30,7 @@ set(TESTS
singletontest singletontest
static_assert_test static_assert_test
streamtest streamtest
test_stack
testfassign1 testfassign1
testfassign2 testfassign2
testfassign3 testfassign3
...@@ -185,6 +186,8 @@ target_link_libraries(testfconstruct_fail1 "dunecommon") ...@@ -185,6 +186,8 @@ target_link_libraries(testfconstruct_fail1 "dunecommon")
add_executable("testfconstruct_fail2" EXCLUDE_FROM_ALL testfconstruct.cc) add_executable("testfconstruct_fail2" EXCLUDE_FROM_ALL testfconstruct.cc)
set_target_properties(testfconstruct_fail2 PROPERTIES COMPILE_FLAGS "-DFVSIZE=5") set_target_properties(testfconstruct_fail2 PROPERTIES COMPILE_FLAGS "-DFVSIZE=5")
target_link_libraries(testfconstruct_fail2 "dunecommon") target_link_libraries(testfconstruct_fail2 "dunecommon")
add_executable("test_stack" test-stack.cc)
target_link_libraries("test_stack" "dunecommon")
add_executable("tuplestest_config" tuplestest.cc) add_executable("tuplestest_config" tuplestest.cc)
add_executable("tuplestest_dune" tuplestest.cc) add_executable("tuplestest_dune" tuplestest.cc)
set_target_properties(tuplestest_dune PROPERTIES COMPILE_FLAGS "-DDISABLE_TR1_TUPLE -DDISABLE_STD_TUPLE") set_target_properties(tuplestest_dune PROPERTIES COMPILE_FLAGS "-DDISABLE_TR1_TUPLE -DDISABLE_STD_TUPLE")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment