You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2010/06/29 20:24:23 UTC
svn commit: r959067 - in /qpid/trunk/qpid/cpp/src: config.h.cmake
tests/CMakeLists.txt tests/Shlib.cpp
Author: shuston
Date: Tue Jun 29 18:24:23 2010
New Revision: 959067
URL: http://svn.apache.org/viewvc?rev=959067&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/cpp/src/config.h.cmake
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
qpid/trunk/qpid/cpp/src/tests/Shlib.cpp
Modified: qpid/trunk/qpid/cpp/src/config.h.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/config.h.cmake?rev=959067&r1=959066&r2=959067&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/config.h.cmake (original)
+++ qpid/trunk/qpid/cpp/src/config.h.cmake Tue Jun 29 18:24:23 2010
@@ -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
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=959067&r1=959066&r2=959067&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Tue Jun 29 18:24:23 2010
@@ -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)
Modified: qpid/trunk/qpid/cpp/src/tests/Shlib.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Shlib.cpp?rev=959067&r1=959066&r2=959067&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Shlib.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/Shlib.cpp Tue Jun 29 18:24:23 2010
@@ -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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org