diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-04-29 22:24:07 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-04-29 22:24:07 +0000 |
| commit | ffad7500891f3fe0e1121fcd3d37038023331cf1 (patch) | |
| tree | 4298e37af70a6c6a847a5c4b8a901607b86c13ec | |
| parent | 560bfc33ce313a647c3ef75921558df71e6bacaf (diff) | |
| download | qpid-python-ffad7500891f3fe0e1121fcd3d37038023331cf1.tar.gz | |
Fix locating of LIBCPG; removed deleted WriteEstimate.cpp, .h files
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@769971 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/cluster.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/qpid/cpp/src/cluster.cmake b/qpid/cpp/src/cluster.cmake index 5788ff5ea1..9b357d3297 100644 --- a/qpid/cpp/src/cluster.cmake +++ b/qpid/cpp/src/cluster.cmake @@ -34,13 +34,12 @@ endif (CMAKE_SYSTEM_NAME STREQUAL Windows) option(BUILD_CPG "Build with CPG support for clustering" ${cluster_default}) if (BUILD_CPG) - 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) + FIND_LIBRARY(LIBCPG cpg /usr/lib/openais /usr/lib64/openais /usr/lib/corosync /usr/lib64/corosync) + if (LIBCPG MATCHES ".*-NOTFOUND$") + message(FATAL_ERROR "cpg library not found, install openais-devel or corosync-devel") + endif (LIBCPG MATCHES ".*-NOTFOUND$") CHECK_INCLUDE_FILES (openais/cpg.h HAVE_OPENAIS_CPG_H) CHECK_INCLUDE_FILES (corosync/cpg.h HAVE_COROSYNC_CPG_H) - if (NOT HAVE_LIBCPG) - message(FATAL_ERROR "libcpg not found, install openais-devel or corosync-devel") - endif (NOT HAVE_LIBCPG) if (NOT HAVE_OPENAIS_CPG_H AND NOT HAVE_COROSYNC_CPG_H) message(FATAL_ERROR "cpg.h not found, install openais-devel or corosync-devel") endif (NOT HAVE_OPENAIS_CPG_H AND NOT HAVE_COROSYNC_CPG_H) @@ -102,8 +101,6 @@ if (BUILD_CPG) qpid/cluster/PollerDispatch.h qpid/cluster/ProxyInputHandler.h qpid/cluster/Quorum.h - qpid/cluster/WriteEstimate.cpp - qpid/cluster/WriteEstimate.h qpid/cluster/types.h ) |