Subject: [Boost-commit] svn:boost r52847 - branches/release/libs/program_options/test
From: dgregor_at_[hidden]
Date: 2009-05-08 02:13:09
Author: dgregor
Date: 2009-05-08 02:13:08 EDT (Fri, 08 May 2009)
New Revision: 52847
URL: http://svn.boost.org/trac/boost/changeset/52847
Log:
Fix CMake build of Program Options DLL tests
Text files modified:
branches/release/libs/program_options/test/CMakeLists.txt | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
Modified: branches/release/libs/program_options/test/CMakeLists.txt
==============================================================================
--- branches/release/libs/program_options/test/CMakeLists.txt (original)
+++ branches/release/libs/program_options/test/CMakeLists.txt 2009-05-08 02:13:08 EDT (Fri, 08 May 2009)
@@ -4,12 +4,24 @@
boost_program_options
boost_test_exec_monitor)
+set(BOOST_TEST_EXEC_MONITOR_SUFFIX "")
+if (NOT BUILD_SINGLE_THREADED)
+ set(BOOST_TEST_EXEC_MONITOR_SUFFIX "-mt")
+endif()
+set(BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-static")
+if (NOT BUILD_RELEASE)
+ set(BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-debug")
+endif()
+
macro(program_options_test_run TESTNAME)
boost_test_run(${TESTNAME}
- DEPENDS boost_program_options boost_test_exec_monitor STATIC)
+ STATIC
+ DEPENDS boost_program_options boost_test_exec_monitor )
boost_test_run("${TESTNAME}_dll"
- "${TESTNAME}.cpp"
- DEPENDS boost_program_options boost_test_exec_monitor-static SHARED)
+ ${TESTNAME}.cpp
+ SHARED
+ DEPENDS boost_program_options
+ "boost_test_exec_monitor${BOOST_TEST_EXEC_MONITOR_SUFFIX}")
endmacro(program_options_test_run)
program_options_test_run(options_description_test)