diff options
| author | Ted Ross <tross@apache.org> | 2011-02-16 13:54:50 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2011-02-16 13:54:50 +0000 |
| commit | 59864976b7bfacbf4a75652a4007b24e5c56b596 (patch) | |
| tree | 19a04e09fbac9400fbdc11eaabe02f34a77d1fdc | |
| parent | 65c42fa4073ee8d5de648540a2a5601ff4ebdbf4 (diff) | |
| download | qpid-python-59864976b7bfacbf4a75652a4007b24e5c56b596.tar.gz | |
QPID-3061 - Added missing xqilla and Boost definitions to cmake
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071252 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | cpp/src/tests/CMakeLists.txt | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 71dce075a2..94f0f7f3ee 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -313,6 +313,10 @@ if (NOT Boost_FILESYSTEM_LIBRARY) set(Boost_FILESYSTEM_LIBRARY boost_filesystem) endif (NOT Boost_FILESYSTEM_LIBRARY) +if (NOT Boost_SYSTEM_LIBRARY) + set(Boost_SYSTEM_LIBRARY boost_system) +endif (NOT Boost_SYSTEM_LIBRARY) + if (NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY) set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY boost_unit_test_framework) endif (NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY) @@ -487,6 +491,7 @@ endif (BUILD_SASL) CHECK_LIBRARY_EXISTS (xerces-c _init "" HAVE_XERCES) CHECK_INCLUDE_FILE_CXX (xercesc/framework/MemBufInputSource.hpp HAVE_XERCES_H) CHECK_INCLUDE_FILE_CXX (xqilla/xqilla-simple.hpp HAVE_XQILLA_H) +CHECK_INCLUDE_FILE_CXX (xqilla/ast/XQEffectiveBooleanValue.hpp HAVE_XQ_EBV) set (xml_default ${xml_force}) if (CMAKE_SYSTEM_NAME STREQUAL Windows) @@ -510,6 +515,10 @@ if (BUILD_XML) message(FATAL_ERROR "XML Exchange support requested but XQilla headers not found") endif (NOT HAVE_XQILLA_H) + if (HAVE_XQ_EBV) + add_definitions(-DXQ_EFFECTIVE_BOOLEAN_VALUE_HPP) + endif (HAVE_XQ_EBV) + add_library (xml MODULE qpid/xml/XmlExchange.cpp qpid/xml/XmlExchange.h @@ -1213,6 +1222,8 @@ install (TARGETS replication_exchange # file whereas older builds only have config.h on autoconf-generated builds. add_definitions(-DHAVE_CONFIG_H) +add_definitions(-DBOOST_FILESYSTEM_VERSION=2) + # Now create the config file from all the info learned above. configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) diff --git a/cpp/src/tests/CMakeLists.txt b/cpp/src/tests/CMakeLists.txt index 5f0d5a883c..3b3b232671 100644 --- a/cpp/src/tests/CMakeLists.txt +++ b/cpp/src/tests/CMakeLists.txt @@ -62,7 +62,7 @@ endif (MSVC) # Like this to work with cmake 2.4 on Unix set (qpid_test_boost_libs - ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) + ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY}) # Macro to make it easier to remember where the tests are built macro(remember_location testname) |