diff options
author | Matt Benjamin <mbenjamin@redhat.com> | 2019-07-24 22:49:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-24 22:49:38 +0200 |
commit | 92712263411550fa825372d6ae2c38a6e606e029 (patch) | |
tree | 16f50c0591352893f10f773e1f8c8a34a95912e8 /src/CMakeLists.txt | |
parent | Merge pull request #29234 from yuriw/wip-yuriw-upgrade-rwg-master (diff) | |
parent | RGWLC: fix expiration header tag match (diff) | |
download | ceph-92712263411550fa825372d6ae2c38a6e606e029.tar.xz ceph-92712263411550fa825372d6ae2c38a6e606e029.zip |
Merge pull request #26160 from linuxbox2/wip-rgw-lc-header
rgw: project and return lc expiration from GET/HEAD and PUT ops
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d945268f41f..f348fc9b8a0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -303,12 +303,13 @@ add_subdirectory(json_spirit) include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/xxHash") include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/rapidjson/include") +find_package(fmt 5.2.1 QUIET) +if(NOT fmt_FOUND) + message(STATUS "Could not find fmt, will build it") + add_subdirectory(fmt) +endif() + if(WITH_SEASTAR) - find_package(fmt 5.2.1 QUIET) - if(NOT fmt_FOUND) - message(STATUS "Could not find fmt, will build it") - add_subdirectory(fmt) - endif() find_package(c-ares 1.13.0 QUIET) if(NOT c-ares_FOUND) message(STATUS "Could not find c-ares, will build it") |