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/CMakeLists.txt | |
| 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/CMakeLists.txt')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 914984825c..cc2b020bd1 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -143,7 +143,7 @@ endif (ENABLE_WARNINGS AND CMAKE_COMPILER_IS_GNUCXX) # Expand a bit from the basic Find_Boost; be specific about what's needed. find_package(Boost 1.33 REQUIRED - COMPONENTS date_time program_options thread unit_test_framework) + COMPONENTS date_time program_options regex thread unit_test_framework) if(NOT Boost_FOUND) message(FATAL_ERROR "Boost C++ libraries not found. Please install or try setting BOOST_ROOT") endif(NOT Boost_FOUND) @@ -222,9 +222,11 @@ if (BUILD_XML) qpid/xml/XmlExchange.h qpid/xml/XmlExchangePlugin.cpp) target_link_libraries (xml xerces-c xqilla qpidbroker pthread) - set_target_properties (xml PROPERTIES - PREFIX "" - LINK_FLAGS -Wl,--no-undefined) + if (CMAKE_COMPILER_IS_GNUCXX) + set_target_properties (xml PROPERTIES + PREFIX "" + LINK_FLAGS -Wl,--no-undefined) + endif (CMAKE_COMPILER_IS_GNUCXX) endif (BUILD_XML) # Build the ACL plugin @@ -246,9 +248,11 @@ if (BUILD_ACL) ) add_library (acl MODULE ${acl_SOURCES}) target_link_libraries (acl qpidbroker) - set_target_properties (acl PROPERTIES - PREFIX "" - LINK_FLAGS -Wl,--no-undefined) + if (CMAKE_COMPILER_IS_GNUCXX) + set_target_properties (acl PROPERTIES + PREFIX "" + LINK_FLAGS -Wl,--no-undefined) + endif (CMAKE_COMPILER_IS_GNUCXX) endif (BUILD_ACL) # Check for optional cluster support requirements |