diff options
| author | Stephen D. Huston <shuston@apache.org> | 2010-06-29 18:24:23 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2010-06-29 18:24:23 +0000 |
| commit | d22b2ab1dba8fbdd73ea0fe5a87ff2fb9b42fedb (patch) | |
| tree | e3979af108e97f27e530c61c21d320c6c4e059fa /qpid/cpp/src/tests/Shlib.cpp | |
| parent | 1c3f1751057c44732bffca120f8064ca2480ecb1 (diff) | |
| download | qpid-python-d22b2ab1dba8fbdd73ea0fe5a87ff2fb9b42fedb.tar.gz | |
Move all shared lib prefix/postfix/suffix settings from tests/CMakeLists.txt to config.h (revises the plan implemented at r770001). Also sets separate macros for MODULE and SHLIB. Fixes QPID-2707.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@959067 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/Shlib.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/Shlib.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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 |