Author: shuston
Date: Wed Apr 29 22:24:07 2009
New Revision: 769971
URL: http://svn.apache.org/viewvc?rev=769971&view=rev
Log:
Fix locating of LIBCPG; removed deleted WriteEstimate.cpp, .h files
Modified:
qpid/trunk/qpid/cpp/src/cluster.cmake
Modified: qpid/trunk/qpid/cpp/src/cluster.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/cluster.cmake?rev=769971&r1=769970&r2=769971&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/cluster.cmake (original)
+++ qpid/trunk/qpid/cpp/src/cluster.cmake Wed Apr 29 22:24:07 2009
@@ -34,13 +34,12 @@
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 @@
qpid/cluster/PollerDispatch.h
qpid/cluster/ProxyInputHandler.h
qpid/cluster/Quorum.h
- qpid/cluster/WriteEstimate.cpp
- qpid/cluster/WriteEstimate.h
qpid/cluster/types.h
)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
