diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-05-11 22:28:26 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-05-11 22:28:26 +0000 |
| commit | a68dafc3523b6ddc13517717bf83cbea60e9fa6a (patch) | |
| tree | fe85a783594548c74424494ce0c01434449d3b1d /qpid/cpp/src/tests | |
| parent | f1a10508996a1082abcff51cdf4722f8443d2dbc (diff) | |
| download | qpid-python-a68dafc3523b6ddc13517717bf83cbea60e9fa6a.tar.gz | |
Patch small probs building tests, examples on Windows
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@773714 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/CMakeLists.txt | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/qpid/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt index 98c4e2ee05..5943f343ec 100644 --- a/qpid/cpp/src/tests/CMakeLists.txt +++ b/qpid/cpp/src/tests/CMakeLists.txt @@ -22,19 +22,22 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) include (FindPythonInterp) +# Using the Boost DLLs triggers warning 4275 on Visual Studio +# (non dll-interface class used as base for dll-interface class). +# This is ok, so suppress the warning. +if (MSVC) + add_definitions( /wd4275 ) +endif (MSVC) + +set (qpid_test_boost_libs ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_REGEX_LIBRARY}) + # # Unit test program # # Unit tests are built as a single program to reduce valgrind overhead -# when running the tests. If you want to build a subset of the tests do -# rm -f unit_test; make unit_test unit_test_OBJECTS="unit_test.o SelectedTest.o" -# -set (qpid_test_boost_libs boost_unit_test_framework boost_regex) -#TESTS+=unit_test -#check_PROGRAMS+=unit_test -#unit_test_LDADD=-lboost_unit_test_framework -lboost_regex \ -# $(lib_client) $(lib_broker) $(lib_console) -# +# when running the tests. If you want to build a subset of the tests run +# ccmake and set unit_tests_to_build to the set you want to build. + set(unit_tests_to_build unit_test exception_test @@ -92,11 +95,6 @@ if (QPID_HAS_XML) endif (QPID_HAS_XML) mark_as_advanced(unit_tests_to_build) -#message(DEBUG "unit_tests_to_build: ${unit_tests_to_build}") -#string (REPLACE ";" ".cpp;" -# unit_test_SOURCES -# ${unit_tests_to_build}) - # Disabled till we move to amqp_0_10 codec. # amqp_0_10/serialize.cpp allSegmentTypes.h \ # amqp_0_10/ProxyTemplate.cpp \ |