diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-04-28 21:51:54 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-04-28 21:51:54 +0000 |
| commit | d003b6fde86d23727f1b77a4856f786354ea3288 (patch) | |
| tree | bda2a71c1f70b41c1c48615b4d187ab855c6d46a /qpid/cpp/src/cluster.cmake | |
| parent | 9231b44bd2e7843d4b44f4ef5aac8ae5f6e399af (diff) | |
| download | qpid-python-d003b6fde86d23727f1b77a4856f786354ea3288.tar.gz | |
Fixed to allow use of cmake 2.4
Fixes to allow cmake to build all the plugin modules as before
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@769559 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/cluster.cmake')
| -rw-r--r-- | qpid/cpp/src/cluster.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qpid/cpp/src/cluster.cmake b/qpid/cpp/src/cluster.cmake index 5d7c4380b6..5788ff5ea1 100644 --- a/qpid/cpp/src/cluster.cmake +++ b/qpid/cpp/src/cluster.cmake @@ -34,9 +34,8 @@ endif (CMAKE_SYSTEM_NAME STREQUAL Windows) option(BUILD_CPG "Build with CPG support for clustering" ${cluster_default}) if (BUILD_CPG) - CHECK_LIBRARY_EXISTS (cpg cpg_local_get - "-L/usr/lib/openais -L/usr/lib64/openais -L/usr/lib/corosync -L/usr/lib64/corosync" - HAVE_LIBCPG) + find_library(LIBCPG cpg /usr/lib/openais /usr/lib64/openais /usr/lib/corosync /usr/lib64/corosync) + CHECK_LIBRARY_EXISTS (${LIBCPG} cpg_local_get "" HAVE_LIBCPG) CHECK_INCLUDE_FILES (openais/cpg.h HAVE_OPENAIS_CPG_H) CHECK_INCLUDE_FILES (corosync/cpg.h HAVE_COROSYNC_CPG_H) if (NOT HAVE_LIBCPG) @@ -108,10 +107,11 @@ if (BUILD_CPG) qpid/cluster/types.h ) - add_library (cluster SHARED ${cluster_SOURCES}) - target_link_libraries (cluster cpg ${CMAN_LIB} qpidbroker qpidclient) + add_library (cluster MODULE ${cluster_SOURCES}) + target_link_libraries (cluster ${LIBCPG} ${CMAN_LIB} qpidbroker qpidclient) #cluster_la_LDFLAGS = $(PLUGINLDFLAGS) - set_target_properties (cluster PROPERTIES VERSION ${qpidc_version}) + set_target_properties (cluster PROPERTIES + PREFIX "") endif (BUILD_CPG) |