summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2009-05-11 22:37:08 +0000
committerStephen D. Huston <shuston@apache.org>2009-05-11 22:37:08 +0000
commit16d8831140821f33d4ff6588bdbfeb523f3182ce (patch)
treebf99edda3772b80e7f6d22fc7c5501131b7da1d8 /cpp
parent5f79a061c6331c010a3f7dc98498d0249774d37c (diff)
downloadqpid-python-16d8831140821f33d4ff6588bdbfeb523f3182ce.tar.gz
Windows adjustments to run tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@773716 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/tests/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/tests/CMakeLists.txt b/cpp/src/tests/CMakeLists.txt
index 5943f343ec..da7bb7d89b 100644
--- a/cpp/src/tests/CMakeLists.txt
+++ b/cpp/src/tests/CMakeLists.txt
@@ -25,8 +25,9 @@ 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.
+# Also, boost lengthy names trigger warning 4503, decorated name length exceeded
if (MSVC)
- add_definitions( /wd4275 )
+ add_definitions( /wd4275 /wd4503 )
endif (MSVC)
set (qpid_test_boost_libs ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_REGEX_LIBRARY})
@@ -217,7 +218,7 @@ target_link_libraries (sender qpidclient)
add_dependencies (check sender)
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
- set (test_script_suffix ".w32")
+ set (test_script_suffix ".bat")
endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
set(test_wrap ${CMAKE_CURRENT_SOURCE_DIR}/test_wrap${test_script_suffix})