You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by fa...@apache.org on 2013/10/25 16:03:36 UTC
svn commit: r1535739 - in /qpid/trunk/qpid/cpp/src: legacystore.cmake
linearstore.cmake
Author: fadams
Date: Fri Oct 25 14:03:36 2013
New Revision: 1535739
URL: http://svn.apache.org/r1535739
Log:
JIRA: QPID-5259 cmake legacy store and linear store messages aren't very helpful if dependencies are missing.
Modified:
qpid/trunk/qpid/cpp/src/legacystore.cmake
qpid/trunk/qpid/cpp/src/linearstore.cmake
Modified: qpid/trunk/qpid/cpp/src/legacystore.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/legacystore.cmake?rev=1535739&r1=1535738&r2=1535739&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/legacystore.cmake (original)
+++ qpid/trunk/qpid/cpp/src/legacystore.cmake Fri Oct 25 14:03:36 2013
@@ -26,40 +26,57 @@ else (DEFINED legacystore_force)
set (legacystore_default OFF)
if (UNIX)
#
- # Find required BerkelyDB
+ # Find required BerkeleyDB
#
include (finddb.cmake)
if (DB_FOUND)
- #
- # find libaio
- #
- CHECK_LIBRARY_EXISTS (aio io_queue_init "" HAVE_AIO)
- CHECK_INCLUDE_FILES (libaio.h HAVE_AIO_H)
- if (HAVE_AIO AND HAVE_AIO_H)
#
- # find libuuid
- #
- CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID)
- CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H)
- IF (HAVE_UUID AND HAVE_UUID_H)
- #
- # allow legacystore to be built
- #
- set (legacystore_default ON)
- ENDIF (HAVE_UUID AND HAVE_UUID_H)
- endif (HAVE_AIO AND HAVE_AIO_H)
+ # find libaio
+ #
+ CHECK_LIBRARY_EXISTS (aio io_queue_init "" HAVE_AIO)
+ CHECK_INCLUDE_FILES (libaio.h HAVE_AIO_H)
+ if (HAVE_AIO AND HAVE_AIO_H)
+ #
+ # find libuuid
+ #
+ CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID)
+ CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H)
+ if (HAVE_UUID AND HAVE_UUID_H)
+ #
+ # allow legacystore to be built
+ #
+ message(STATUS "BerkeleyDB for C++, libaio and uuid found, Legacystore support enabled")
+ set (legacystore_default ON)
+ else (HAVE_UUID AND HAVE_UUID_H)
+ if (NOT HAVE_UUID)
+ message(STATUS "Legacystore requires uuid which is absent.")
+ endif (NOT HAVE_UUID)
+ if (NOT HAVE_UUID_H)
+ message(STATUS "Legacystore requires uuid.h which is absent.")
+ endif (NOT HAVE_UUID_H)
+ endif (HAVE_UUID AND HAVE_UUID_H)
+ else (HAVE_AIO AND HAVE_AIO_H)
+ if (NOT HAVE_AIO)
+ message(STATUS "Legacystore requires libaio which is absent.")
+ endif (NOT HAVE_AIO)
+ if (NOT HAVE_AIO_H)
+ message(STATUS "Legacystore requires libaio.h which is absent.")
+ endif (NOT HAVE_AIO_H)
+ endif (HAVE_AIO AND HAVE_AIO_H)
+ else (DB_FOUND)
+ message(STATUS "Legacystore requires BerkeleyDB for C++ which is absent.")
endif (DB_FOUND)
endif (UNIX)
endif (DEFINED legacystore_force)
option(BUILD_LEGACYSTORE "Build legacystore persistent store" ${legacystore_default})
-
+
if (BUILD_LEGACYSTORE)
if (NOT UNIX)
message(FATAL_ERROR "Legacystore produced only on Unix platforms")
endif (NOT UNIX)
if (NOT DB_FOUND)
- message(FATAL_ERROR "Legacystore requires BerkeleyDB which is absent.")
+ message(FATAL_ERROR "Legacystore requires BerkeleyDB for C++ which is absent.")
endif (NOT DB_FOUND)
if (NOT HAVE_AIO)
message(FATAL_ERROR "Legacystore requires libaio which is absent.")
Modified: qpid/trunk/qpid/cpp/src/linearstore.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/linearstore.cmake?rev=1535739&r1=1535738&r2=1535739&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/linearstore.cmake (original)
+++ qpid/trunk/qpid/cpp/src/linearstore.cmake Fri Oct 25 14:03:36 2013
@@ -17,7 +17,7 @@
# under the License.
#
#
-# Legacy store library CMake fragment, to be included in CMakeLists.txt
+# Linear store library CMake fragment, to be included in CMakeLists.txt
#
if (DEFINED linearstore_force)
@@ -26,28 +26,45 @@ else (DEFINED linearstore_force)
set (linearstore_default OFF)
if (UNIX)
#
- # Find required BerkelyDB
+ # Find required BerkeleyDB
#
include (finddb.cmake)
if (DB_FOUND)
- #
- # find libaio
- #
- CHECK_LIBRARY_EXISTS (aio io_queue_init "" HAVE_AIO)
- CHECK_INCLUDE_FILES (libaio.h HAVE_AIO_H)
- if (HAVE_AIO AND HAVE_AIO_H)
#
- # find libuuid
- #
- CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID)
- CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H)
- IF (HAVE_UUID AND HAVE_UUID_H)
- #
- # allow linearstore to be built
- #
- set (linearstore_default ON)
- ENDIF (HAVE_UUID AND HAVE_UUID_H)
- endif (HAVE_AIO AND HAVE_AIO_H)
+ # find libaio
+ #
+ CHECK_LIBRARY_EXISTS (aio io_queue_init "" HAVE_AIO)
+ CHECK_INCLUDE_FILES (libaio.h HAVE_AIO_H)
+ if (HAVE_AIO AND HAVE_AIO_H)
+ #
+ # find libuuid
+ #
+ CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID)
+ CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H)
+ if (HAVE_UUID AND HAVE_UUID_H)
+ #
+ # allow linearstore to be built
+ #
+ message(STATUS "BerkeleyDB for C++, libaio and uuid found, Linearstore support enabled")
+ set (linearstore_default ON)
+ else (HAVE_UUID AND HAVE_UUID_H)
+ if (NOT HAVE_UUID)
+ message(STATUS "Linearstore requires uuid which is absent.")
+ endif (NOT HAVE_UUID)
+ if (NOT HAVE_UUID_H)
+ message(STATUS "Linearstore requires uuid.h which is absent.")
+ endif (NOT HAVE_UUID_H)
+ endif (HAVE_UUID AND HAVE_UUID_H)
+ else (HAVE_AIO AND HAVE_AIO_H)
+ if (NOT HAVE_AIO)
+ message(STATUS "Linearstore requires libaio which is absent.")
+ endif (NOT HAVE_AIO)
+ if (NOT HAVE_AIO_H)
+ message(STATUS "Linearstore requires libaio.h which is absent.")
+ endif (NOT HAVE_AIO_H)
+ endif (HAVE_AIO AND HAVE_AIO_H)
+ else (DB_FOUND)
+ message(STATUS "Linearstore requires BerkeleyDB for C++ which is absent.")
endif (DB_FOUND)
endif (UNIX)
endif (DEFINED linearstore_force)
@@ -59,7 +76,7 @@ if (BUILD_LINEARSTORE)
message(FATAL_ERROR "Linearstore produced only on Unix platforms")
endif (NOT UNIX)
if (NOT DB_FOUND)
- message(FATAL_ERROR "Linearstore requires BerkeleyDB which is absent.")
+ message(FATAL_ERROR "Linearstore requires BerkeleyDB for C++ which is absent.")
endif (NOT DB_FOUND)
if (NOT HAVE_AIO)
message(FATAL_ERROR "Linearstore requires libaio which is absent.")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org