diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-05-05 22:13:28 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-05-05 22:13:28 +0000 |
| commit | cf2b0abec943a8d3e9f00c64db8f2a9ee16b2f92 (patch) | |
| tree | f8ad9a9fdc1ffb2990e69aa79f1fbb42222ddd8f /qpid/cpp/src/CMakeLists.txt | |
| parent | 97fc8eb7ac4a6e91626fd507d9ff808b6d593e13 (diff) | |
| download | qpid-python-cf2b0abec943a8d3e9f00c64db8f2a9ee16b2f92.tar.gz | |
Hack around the namespace pollution in QPID-1737
Hack around simultaneous import and definition of ManagementAgent::Singleton in qpidbroker
Make ACL plugin optional (default off on Windows currently)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@771989 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/CMakeLists.txt')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 90647bd49d..605c5b6e2c 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -228,20 +228,28 @@ if (BUILD_XML) endif (BUILD_XML) # Build the ACL plugin -set (acl_SOURCES - qpid/acl/Acl.cpp - qpid/acl/Acl.h - qpid/acl/AclData.cpp - qpid/acl/AclData.h - qpid/acl/AclPlugin.cpp - qpid/acl/AclReader.cpp - qpid/acl/AclReader.h - ) +set (acl_default ON) +# Like this until we fix exporting symbols from the generated management code +if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) + set(acl_default OFF) +endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) +option(BUILD_ACL "Build ACL enforcement broker plugin" ${acl_default}) +if (BUILD_ACL) + set (acl_SOURCES + qpid/acl/Acl.cpp + qpid/acl/Acl.h + qpid/acl/AclData.cpp + qpid/acl/AclData.h + qpid/acl/AclPlugin.cpp + qpid/acl/AclReader.cpp + qpid/acl/AclReader.h + ) add_library (acl MODULE ${acl_SOURCES}) target_link_libraries (acl qpidbroker) set_target_properties (acl PROPERTIES PREFIX "" LINK_FLAGS -Wl,--no-undefined) +endif (BUILD_ACL) # Check for optional cluster support requirements include (cluster.cmake) |