diff options
| author | Ted Ross <tross@apache.org> | 2012-11-30 19:17:28 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2012-11-30 19:17:28 +0000 |
| commit | acbde11b61d7bb3a0cdd81e1201d8565a4cbdfbd (patch) | |
| tree | 8b44f678894995ebe98deb128e407e6d80946668 /qpid/cpp/src/ssl.cmake | |
| parent | 67dd5f7e03147e1e145f8d063b7b443ede02bb2e (diff) | |
| download | qpid-python-acbde11b61d7bb3a0cdd81e1201d8565a4cbdfbd.tar.gz | |
QPID-4449 - Reverted much of the original change and re-implemented the fix in a simpler way.
The build-define _IN_QPID_BROKER is now used for modules built in the broker. The shared-pointer
changes are conditionally compiled only for in-broker cases.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1415796 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/ssl.cmake')
| -rw-r--r-- | qpid/cpp/src/ssl.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/ssl.cmake b/qpid/cpp/src/ssl.cmake index b1a1ba9fa3..1670e70209 100644 --- a/qpid/cpp/src/ssl.cmake +++ b/qpid/cpp/src/ssl.cmake @@ -90,7 +90,7 @@ if (BUILD_SSL) target_link_libraries (ssl qpidbroker sslcommon ${Boost_PROGRAM_OPTIONS_LIBRARY}) set_target_properties (ssl PROPERTIES PREFIX "" - COMPILE_FLAGS ${NSS_COMPILE_FLAGS}) + COMPILE_FLAGS "${NSS_COMPILE_FLAGS} -D_IN_QPID_BROKER") if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(ssl PROPERTIES LINK_FLAGS "${GCC_CATCH_UNDEFINED}") |