diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2014-01-15 22:31:53 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2014-01-15 22:31:53 +0000 |
| commit | 368e40b6f2525eb907d2d4b2f3d25c7a90ed6b7d (patch) | |
| tree | f9abce7c5d9c9f6d142cf407472fd8023927eec4 /qpid/cpp/src/legacystore.cmake | |
| parent | 810ac4c70346730fb7103e823f26e30e7f68a731 (diff) | |
| download | qpid-python-368e40b6f2525eb907d2d4b2f3d25c7a90ed6b7d.tar.gz | |
NO-JIRA: Removed linear/legacy store CMake checks for uuid library
- The stores do not directly depend on the library but rather use
the platform indirection in qpid to get to uuid capabilities.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1558591 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/legacystore.cmake')
| -rw-r--r-- | qpid/cpp/src/legacystore.cmake | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/qpid/cpp/src/legacystore.cmake b/qpid/cpp/src/legacystore.cmake index de589189c3..160ca56988 100644 --- a/qpid/cpp/src/legacystore.cmake +++ b/qpid/cpp/src/legacystore.cmake @@ -37,24 +37,10 @@ else (DEFINED legacystore_force) CHECK_INCLUDE_FILES (libaio.h HAVE_AIO_H) if (HAVE_AIO AND HAVE_AIO_H) # - # find libuuid + # allow legacystore to be built # - 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) + message(STATUS "BerkeleyDB for C++ and libaio found, Legacystore support enabled") + set (legacystore_default ON) else (HAVE_AIO AND HAVE_AIO_H) if (NOT HAVE_AIO) message(STATUS "Legacystore requires libaio which is absent.") @@ -84,12 +70,6 @@ if (BUILD_LEGACYSTORE) if (NOT HAVE_AIO_H) message(FATAL_ERROR "Legacystore requires libaio.h which is absent.") endif (NOT HAVE_AIO_H) - if (NOT HAVE_UUID) - message(FATAL_ERROR "Legacystore requires uuid which is absent.") - endif (NOT HAVE_UUID) - if (NOT HAVE_UUID_H) - message(FATAL_ERROR "Legacystore requires uuid.h which is absent.") - endif (NOT HAVE_UUID_H) # Journal source files set (legacy_jrnl_SOURCES |