Skip to content

Commit 15c990b

Browse files
committed
Fix CMake build of Program Options DLL tests
[SVN r52847]
1 parent 1a884ce commit 15c990b

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

test/CMakeLists.txt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,24 @@ set(PROGRAM_OPTIONS_LIBRARIES
44
boost_program_options
55
boost_test_exec_monitor)
66

7+
set(BOOST_TEST_EXEC_MONITOR_SUFFIX "")
8+
if (NOT BUILD_SINGLE_THREADED)
9+
set(BOOST_TEST_EXEC_MONITOR_SUFFIX "-mt")
10+
endif()
11+
set(BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-static")
12+
if (NOT BUILD_RELEASE)
13+
set(BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-debug")
14+
endif()
15+
716
macro(program_options_test_run TESTNAME)
817
boost_test_run(${TESTNAME}
9-
DEPENDS boost_program_options boost_test_exec_monitor STATIC)
18+
STATIC
19+
DEPENDS boost_program_options boost_test_exec_monitor )
1020
boost_test_run("${TESTNAME}_dll"
11-
"${TESTNAME}.cpp"
12-
DEPENDS boost_program_options boost_test_exec_monitor-static SHARED)
21+
${TESTNAME}.cpp
22+
SHARED
23+
DEPENDS boost_program_options
24+
"boost_test_exec_monitor${BOOST_TEST_EXEC_MONITOR_SUFFIX}")
1325
endmacro(program_options_test_run)
1426

1527
program_options_test_run(options_description_test)

0 commit comments

Comments
 (0)