From: dgregor_at_[hidden]
Date: 2007-05-22 21:36:42
Author: dgregor
Date: 2007-05-22 21:36:40 EDT (Tue, 22 May 2007)
New Revision: 4203
URL: http://svn.boost.org/trac/boost/changeset/4203
Log:
libs/program_options/test/CMakeLists.txt:
- Fix linking of _dll tests
libs/serialization/src/CMakeLists.txt:
- boost_wserialization depends on boost_serialization
libs/serialization/test/CMakeLists.txt:
- Fix linking of wide-character tests
Text files modified:
sandbox/troy/boost_1_34_0/libs/program_options/test/CMakeLists.txt | 2 +-
sandbox/troy/boost_1_34_0/libs/serialization/src/CMakeLists.txt | 4 ++--
sandbox/troy/boost_1_34_0/libs/serialization/test/CMakeLists.txt | 5 ++---
3 files changed, 5 insertions(+), 6 deletions(-)
Modified: sandbox/troy/boost_1_34_0/libs/program_options/test/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/program_options/test/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/program_options/test/CMakeLists.txt 2007-05-22 21:36:40 EDT (Tue, 22 May 2007)
@@ -7,7 +7,7 @@
LIBRARIES boost_program_options-static boost_test_exec_monitor-static)
boost_test_run("${TESTNAME}_dll"
SOURCES "${TESTNAME}.cpp"
- LIBRARIES boost_program_options-static boost_test_exec_monitor-shared)
+ LIBRARIES boost_program_options-shared boost_test_exec_monitor-static)
endmacro(program_options_test_run)
program_options_test_run(options_description_test)
Modified: sandbox/troy/boost_1_34_0/libs/serialization/src/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/serialization/src/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/serialization/src/CMakeLists.txt 2007-05-22 21:36:40 EDT (Tue, 22 May 2007)
@@ -51,7 +51,7 @@
if (BUILD_BOOST_WSERIALIZATION)
boost_library(boost_wserialization
${WSOURCES}
- SHARED_COMPILE_FLAGS -DBOOST_SERIALIZATION_DYN_LINK=1
- -DBOOST_WSERIALIZATION_DYN_LINK=1
+ SHARED_COMPILE_FLAGS "-DBOOST_SERIALIZATION_DYN_LINK=1 -DBOOST_WSERIALIZATION_DYN_LINK=1"
+ DEPENDS boost_serialization
)
endif(BUILD_BOOST_WSERIALIZATION)
Modified: sandbox/troy/boost_1_34_0/libs/serialization/test/CMakeLists.txt
==============================================================================
--- sandbox/troy/boost_1_34_0/libs/serialization/test/CMakeLists.txt (original)
+++ sandbox/troy/boost_1_34_0/libs/serialization/test/CMakeLists.txt 2007-05-22 21:36:40 EDT (Tue, 22 May 2007)
@@ -25,7 +25,7 @@
set(BSL_TEST_STATIC_LIBRARIES
"boost_wserialization-static" ${BSL_TEST_STATIC_LIBRARIES})
set(BSL_TEST_SHARED_LIBRARIES
- "boost_wserialization-static" ${BSL_TEST_SHARED_LIBRARIES})
+ "boost_wserialization-shared" ${BSL_TEST_SHARED_LIBRARIES})
endif(ARCHIVE MATCHES ".*warchive")
endif(NOT BSL_NO_LIBS)
@@ -39,8 +39,7 @@
boost_test_run("${testname}_${ARCHIVE}_dll"
SOURCES "${testname}.cpp"
LIBRARIES boost_test_exec_monitor-static ${BSL_TEST_SHARED_LIBRARIES}
- COMPILE_FLAGS "-DBOOST_LIB_DIAGNOSTIC=1 -DBOOST_ALL_DYN_LINK=1"
- -DBOOST_ARCHIVE_TEST=${ARCHIVE}.hpp)
+ COMPILE_FLAGS "-DBOOST_ARCHIVE_TEST=${ARCHIVE}.hpp -DBOOST_LIB_DIAGNOSTIC=1 -DBOOST_ALL_DYN_LINK=1")
endforeach(ARCHIVE ${BOOST_ARCHIVE_LIST})
endmacro(serialization_test)