diff options
| -rw-r--r-- | qpid/cpp/src/config.h.cmake | 5 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/Shlib.cpp | 12 |
3 files changed, 11 insertions, 13 deletions
diff --git a/qpid/cpp/src/config.h.cmake b/qpid/cpp/src/config.h.cmake index 012bf285b5..06eacd85d7 100644 --- a/qpid/cpp/src/config.h.cmake +++ b/qpid/cpp/src/config.h.cmake @@ -39,12 +39,17 @@ #cmakedefine QPID_LIBEXEC_DIR "${QPID_LIBEXEC_DIR}" +#define QPID_SHLIB_PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}" +#define QPID_MODULE_PREFIX #cmakedefine QPID_DEBUG_POSTFIX "${QPID_DEBUG_POSTFIX}" #if defined(QPID_DEBUG_POSTFIX) && defined (_DEBUG) +# define QPID_SHLIB_POSTFIX QPID_DEBUG_POSTFIX # define QPID_MODULE_POSTFIX QPID_DEBUG_POSTFIX #else +# define QPID_SHLIB_POSTFIX # define QPID_MODULE_POSTFIX #endif +#define QPID_SHLIB_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}" #define QPID_MODULE_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}" #cmakedefine QPID_HAS_CLOCK_GETTIME diff --git a/qpid/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt index 09865caca5..a6ca6206c4 100644 --- a/qpid/cpp/src/tests/CMakeLists.txt +++ b/qpid/cpp/src/tests/CMakeLists.txt @@ -156,13 +156,6 @@ mark_as_advanced(unit_tests_to_build) add_executable (unit_test unit_test ${unit_tests_to_build} ${platform_test_additions}) -# The generally recommended way to add macro settings is to use -# COMPILE_DEFINITIONS, but it's a rough go to add more than one definition -# with a value; in this case, assuming that -D works everywhere is easier. -set_source_files_properties (ReplicationTest.cpp Shlib.cpp ${xml_tests} - PROPERTIES - COMPILE_FLAGS - "-DQPID_MODULE_SUFFIX=\\\"${CMAKE_SHARED_MODULE_SUFFIX}\\\" -DQPID_MODULE_PREFIX=\\\"${CMAKE_SHARED_MODULE_PREFIX}\\\"") target_link_libraries (unit_test ${qpid_test_boost_libs} qpidmessaging qpidbroker qmfconsole) diff --git a/qpid/cpp/src/tests/Shlib.cpp b/qpid/cpp/src/tests/Shlib.cpp index 25974d0ebb..d8ad4c14d8 100644 --- a/qpid/cpp/src/tests/Shlib.cpp +++ b/qpid/cpp/src/tests/Shlib.cpp @@ -35,10 +35,10 @@ typedef void (*CallMe)(int*); QPID_AUTO_TEST_CASE(testShlib) { - // The CMake-based build passes in the module suffix; if it's not there, - // this is a Linux/UNIX libtool-based build. -#if defined (QPID_MODULE_PREFIX) && defined (QPID_MODULE_SUFFIX) - Shlib sh("./" QPID_MODULE_PREFIX "shlibtest" QPID_MODULE_POSTFIX QPID_MODULE_SUFFIX); + // The CMake-based build passes in the shared lib suffix; if it's not + // there, this is a Linux/UNIX libtool-based build. +#if defined (QPID_SHLIB_PREFIX) && defined (QPID_SHLIB_SUFFIX) + Shlib sh("./" QPID_SHLIB_PREFIX "shlibtest" QPID_SHLIB_POSTFIX QPID_SHLIB_SUFFIX); #else Shlib sh(".libs/libshlibtest.so"); #endif @@ -59,8 +59,8 @@ QPID_AUTO_TEST_CASE(testShlib) { QPID_AUTO_TEST_CASE(testAutoShlib) { int unloaded = 0; { -#if defined (QPID_MODULE_PREFIX) && defined (QPID_MODULE_SUFFIX) - AutoShlib sh("./" QPID_MODULE_PREFIX "shlibtest" QPID_MODULE_POSTFIX QPID_MODULE_SUFFIX); +#if defined (QPID_SHLIB_PREFIX) && defined (QPID_SHLIB_SUFFIX) + AutoShlib sh("./" QPID_SHLIB_PREFIX "shlibtest" QPID_SHLIB_POSTFIX QPID_SHLIB_SUFFIX); #else AutoShlib sh(".libs/libshlibtest.so"); #endif |