Boost logo

Boost-Commit :

From: dgregor_at_[hidden]
Date: 2008-07-18 11:11:58


Author: dgregor
Date: 2008-07-18 11:11:58 EDT (Fri, 18 Jul 2008)
New Revision: 47564
URL: http://svn.boost.org/trac/boost/changeset/47564

Log:
Fix the remaining Boost.Regex testing issues in CMake
Text files modified:
   branches/CMake/release/libs/regex/test/CMakeLists.txt | 13 ++++++++-----
   1 files changed, 8 insertions(+), 5 deletions(-)

Modified: branches/CMake/release/libs/regex/test/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/regex/test/CMakeLists.txt (original)
+++ branches/CMake/release/libs/regex/test/CMakeLists.txt 2008-07-18 11:11:58 EDT (Fri, 18 Jul 2008)
@@ -10,7 +10,8 @@
 
   boost_test_run(${TESTNAME} ${REGEX_TEST_SOURCES}
     COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
- DEPENDS boost_regex SHARED)
+ DEPENDS boost_regex
+ EXTRA_OPTIONS SHARED)
 endmacro(regex_test)
 
 set(R_SOURCES
@@ -57,16 +58,18 @@
 
 boost_test_run(static_mutex_test static_mutex/static_mutex_test.cpp
   COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
- MULTI_THREADED SHARED
- DEPENDS boost_regex boost_thread)
+ DEPENDS boost_regex boost_thread
+ EXTRA_OPTIONS MULTI_THREADED SHARED)
 
 regex_test(object_cache_test object_cache/object_cache_test.cpp)
 boost_test_run(regex_config_info config_info/regex_config_info.cpp
- DEPENDS boost_regex STATIC)
+ DEPENDS boost_regex
+ EXTRA_OPTIONS STATIC)
 
 boost_test_run(regex_dll_config_info config_info/regex_config_info.cpp
   COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
- DEPENDS boost_regex SHARED)
+ DEPENDS boost_regex
+ EXTRA_OPTIONS SHARED)
 
 regex_test(test_collate_info collate_info/collate_info.cpp)
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk