diff options
-rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/client/SslConnector.cpp | 3 | ||||
-rw-r--r-- | qpid/cpp/src/rdma.cmake | 6 | ||||
-rw-r--r-- | qpid/cpp/src/ssl.cmake | 12 |
4 files changed, 16 insertions, 7 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 91b98c65c4..5b42e72a37 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -219,7 +219,7 @@ if (QPID_HAS_XML) target_link_libraries (xml xerces-c xqilla qpidbroker) set_target_properties (xml PROPERTIES VERSION ${qpidc_version} - LINK_FLAGS -no-undefined) + LINK_FLAGS -Wl,--no-undefined) endif (QPID_HAS_XML) # Check for optional cluster support requirements diff --git a/qpid/cpp/src/qpid/client/SslConnector.cpp b/qpid/cpp/src/qpid/client/SslConnector.cpp index a4298dd4ca..7b0bcc6f1e 100644 --- a/qpid/cpp/src/qpid/client/SslConnector.cpp +++ b/qpid/cpp/src/qpid/client/SslConnector.cpp @@ -20,6 +20,7 @@ */ #include "Connector.h" +#include "config.h" #include "Bounds.h" #include "ConnectionImpl.h" #include "ConnectionSettings.h" @@ -146,7 +147,7 @@ namespace { StaticInit() { try { SslOptions options; - options.parse (0, 0, CONF_FILE, true); + options.parse (0, 0, QPIDC_CONF_FILE, true); if (options.certDbPath.empty()) { QPID_LOG(info, "SSL connector not enabled, you must set QPID_SSL_CERT_DB to enable it."); } else { diff --git a/qpid/cpp/src/rdma.cmake b/qpid/cpp/src/rdma.cmake index 6ad9c81f23..a48329a6d5 100644 --- a/qpid/cpp/src/rdma.cmake +++ b/qpid/cpp/src/rdma.cmake @@ -60,7 +60,7 @@ if (BUILD_RDMA) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(rdmawrap PROPERTIES COMPILE_FLAGS -Wno-missing-field-initializers - LINK_FLAGS -no-undefined) + LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) add_library (rdma SHARED qpid/sys/RdmaIOPlugin.cpp) @@ -69,7 +69,7 @@ if (BUILD_RDMA) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(rdmawrap PROPERTIES COMPILE_FLAGS -Wno-missing-field-initializers - LINK_FLAGS -no-undefined) + LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) add_library (rdmaconnector SHARED qpid/client/RdmaConnector.cpp) @@ -78,7 +78,7 @@ if (BUILD_RDMA) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(rdmaconnector PROPERTIES COMPILE_FLAGS -Wno-missing-field-initializers - LINK_FLAGS -no-undefined) + LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) # RDMA test/sample programs diff --git a/qpid/cpp/src/ssl.cmake b/qpid/cpp/src/ssl.cmake index d7b18d3a27..765ed3fdcf 100644 --- a/qpid/cpp/src/ssl.cmake +++ b/qpid/cpp/src/ssl.cmake @@ -41,15 +41,23 @@ if (BUILD_SSL) message(FATAL_ERROR "libnss not found, required for SSL support") endif (NSS_CONFIG STREQUAL NSS_CONFIG-NOTFOUND) # Output from nss/snpr-config ends with newline, so strip it + # Also, sometimes there's no need for additional -I options (or -L) but + # the -I is included anyway; in these cases, ignore it. execute_process (COMMAND ${NSPR_CONFIG} --cflags OUTPUT_VARIABLE get_flags) string (STRIP ${get_flags} NSPR_CFLAGS) + if (NSPR_CFLAGS STREQUAL -I) + set (NSPR_CFLAGS ) + endif (NSPR_CFLAGS STREQUAL -I) execute_process (COMMAND ${NSPR_CONFIG} --libs OUTPUT_VARIABLE get_flags) string (STRIP ${get_flags} NSPR_LIBS) execute_process (COMMAND ${NSS_CONFIG} --cflags OUTPUT_VARIABLE get_flags) string (STRIP ${get_flags} NSS_CFLAGS) + if (NSS_CFLAGS STREQUAL -I) + set (NSS_CFLAGS ) + endif (NSS_CFLAGS STREQUAL -I) execute_process (COMMAND ${NSS_CONFIG} --libs OUTPUT_VARIABLE get_flags) string (STRIP ${get_flags} NSS_LIBS) @@ -83,7 +91,7 @@ if (BUILD_SSL) COMPILE_FLAGS "${NSPR_CFLAGS} ${NSS_CFLAGS}") if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(ssl PROPERTIES - LINK_FLAGS -no-undefined) + LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) add_library (sslconnector SHARED qpid/client/SslConnector.cpp) @@ -91,7 +99,7 @@ if (BUILD_SSL) set_target_properties (sslconnector PROPERTIES VERSION ${qpidc_version}) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(sslconnector PROPERTIES - LINK_FLAGS -no-undefined) + LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) endif (BUILD_SSL) |