diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2011-11-03 14:32:01 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2011-11-03 14:32:01 +0000 |
| commit | a68d12beaff7bccff4bc8c8833ce9fac1c3ec6e4 (patch) | |
| tree | c8d30f06a378c648ee99d193cdfc05e1e3c69434 /cpp/src/ssl.cmake | |
| parent | fa7568b96308ac17374285c0c65de522a91ccf0e (diff) | |
| download | qpid-python-a68d12beaff7bccff4bc8c8833ce9fac1c3ec6e4.tar.gz | |
QPID-3464: Build Improvements (CMake) [from Jan-Marek Glogowski]
- Improved CMake build significantly bringing it closer in parity to
autotools build
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1197146 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/ssl.cmake')
| -rw-r--r-- | cpp/src/ssl.cmake | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/cpp/src/ssl.cmake b/cpp/src/ssl.cmake index c205845388..6bc1d07d6d 100644 --- a/cpp/src/ssl.cmake +++ b/cpp/src/ssl.cmake @@ -40,15 +40,15 @@ endif (CMAKE_SYSTEM_NAME STREQUAL Windows) option(BUILD_SSL "Build with support for SSL" ${ssl_default}) if (BUILD_SSL) - if (CMAKE_SYSTEM_NAME STREQUAL Windows) - set (sslclient_windows_SOURCES qpid/client/windows/SslConnector.cpp) - set (sslbroker_windows_SOURCES qpid/broker/windows/SslProtocolFactory.cpp) - set (sslcommon_windows_SOURCES - qpid/sys/windows/SslAsynchIO.cpp - ) - set (windows_ssl_libs Secur32.lib) - set (windows_ssl_server_libs Crypt32.lib) - else (CMAKE_SYSTEM_NAME STREQUAL Windows) + if (CMAKE_SYSTEM_NAME STREQUAL Windows) + set (sslclient_windows_SOURCES qpid/client/windows/SslConnector.cpp) + set (sslbroker_windows_SOURCES qpid/broker/windows/SslProtocolFactory.cpp) + set (sslcommon_windows_SOURCES + qpid/sys/windows/SslAsynchIO.cpp + ) + set (windows_ssl_libs Secur32.lib) + set (windows_ssl_server_libs Crypt32.lib) + else (CMAKE_SYSTEM_NAME STREQUAL Windows) if (NOT NSS_FOUND) message(FATAL_ERROR "nss/nspr not found, required for ssl support") @@ -76,10 +76,15 @@ if (BUILD_SSL) add_library (sslcommon SHARED ${sslcommon_SOURCES}) target_link_libraries (sslcommon qpidcommon) set_target_properties (sslcommon PROPERTIES - VERSION ${qpidc_version} + VERSION ${sslcommon_version} COMPILE_FLAGS ${NSS_COMPILE_FLAGS} LINK_FLAGS ${NSS_LINK_FLAGS}) + install (TARGETS sslcommon + DESTINATION ${QPID_INSTALL_LIBDIR} + COMPONENT ${QPID_COMPONENT_COMMON}) + install_pdb (sslcommon ${QPID_COMPONENT_COMMON}) + set (ssl_SOURCES qpid/sys/SslPlugin.cpp qpid/sys/ssl/SslHandler.h |