Author: shuston Date: Tue Apr 21 19:48:48 2009 New Revision: 767265 URL: http://svn.apache.org/viewvc?rev=767265&view=rev Log: Fix compile options
Modified: qpid/branches/cmake/qpid/cpp/src/CMakeLists.txt qpid/branches/cmake/qpid/cpp/src/qpid/client/SslConnector.cpp qpid/branches/cmake/qpid/cpp/src/rdma.cmake qpid/branches/cmake/qpid/cpp/src/ssl.cmake Modified: qpid/branches/cmake/qpid/cpp/src/CMakeLists.txt URL: http://svn.apache.org/viewvc/qpid/branches/cmake/qpid/cpp/src/CMakeLists.txt?rev=767265&r1=767264&r2=767265&view=diff ============================================================================== --- qpid/branches/cmake/qpid/cpp/src/CMakeLists.txt (original) +++ qpid/branches/cmake/qpid/cpp/src/CMakeLists.txt Tue Apr 21 19:48:48 2009 @@ -219,7 +219,7 @@ 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 Modified: qpid/branches/cmake/qpid/cpp/src/qpid/client/SslConnector.cpp URL: http://svn.apache.org/viewvc/qpid/branches/cmake/qpid/cpp/src/qpid/client/SslConnector.cpp?rev=767265&r1=767264&r2=767265&view=diff ============================================================================== --- qpid/branches/cmake/qpid/cpp/src/qpid/client/SslConnector.cpp (original) +++ qpid/branches/cmake/qpid/cpp/src/qpid/client/SslConnector.cpp Tue Apr 21 19:48:48 2009 @@ -20,6 +20,7 @@ */ #include "Connector.h" +#include "config.h" #include "Bounds.h" #include "ConnectionImpl.h" #include "ConnectionSettings.h" @@ -146,7 +147,7 @@ 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 { Modified: qpid/branches/cmake/qpid/cpp/src/rdma.cmake URL: http://svn.apache.org/viewvc/qpid/branches/cmake/qpid/cpp/src/rdma.cmake?rev=767265&r1=767264&r2=767265&view=diff ============================================================================== --- qpid/branches/cmake/qpid/cpp/src/rdma.cmake (original) +++ qpid/branches/cmake/qpid/cpp/src/rdma.cmake Tue Apr 21 19:48:48 2009 @@ -60,7 +60,7 @@ 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 (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 (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 Modified: qpid/branches/cmake/qpid/cpp/src/ssl.cmake URL: http://svn.apache.org/viewvc/qpid/branches/cmake/qpid/cpp/src/ssl.cmake?rev=767265&r1=767264&r2=767265&view=diff ============================================================================== --- qpid/branches/cmake/qpid/cpp/src/ssl.cmake (original) +++ qpid/branches/cmake/qpid/cpp/src/ssl.cmake Tue Apr 21 19:48:48 2009 @@ -41,15 +41,23 @@ 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 @@ 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 @@ 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) --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org