MB-51719: Build fmtlib v8.1.1

Create a cbdeps of fmtlib v8.1.1, but don't yet use it. This is required to upgrade Folly to latest stable (requires at least 8.0.1). We are not yet using this version of fmtlib, as we also need to rebuild spdlog to use the new version; if tried to use v8 of fmtlib then the current version of spdlog fails to build. After spdlog has also been rebuilt for the newer version, we can switch to use both fmtlib v8.1.1 and spdlog v1.10.0 simultaneously. Change-Id: I57f91d00e82dda88323322081fec78fc0f73c3cf Reviewed-on: https://review.couchbase.org/c/tlm/+/173281 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: Trond Norbye <trond.norbye@couchbase.com> Reviewed-by: James H <james.harrison@couchbase.com>
couchbase · Apr 8, 2022 · 15b5f9c · 15b5f9c
1 parent b5be39f
commit 15b5f9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/deps/packages/CMakeLists.txt b/deps/packages/CMakeLists.txt
@@ -202,7 +202,7 @@ _ADD_DEP_PACKAGE(maven 3.5.2 master 6)
 _ADD_DEP_PACKAGE(openjdk-rt 1.8.0.171 UNUSED 2)
 
 _ADD_DEP_PACKAGE(double-conversion 3.0.0 v3.0.0 4)
-_ADD_DEP_PACKAGE(fmt 7.1.3 7.1.3 2)
+_ADD_DEP_PACKAGE(fmt 8.1.1 8.1.1 1)
 _ADD_DEP_PACKAGE(glog v0.4.0 v0.4.0 1)
 _ADD_DEP_PACKAGE(benchmark v1.6.0 v1.6.0 1)
 _ADD_DEP_PACKAGE(googletest 1.11.0 1.11.0 4)

diff --git a/deps/packages/fmt/CMakeLists.txt b/deps/packages/fmt/CMakeLists.txt
@@ -9,6 +9,11 @@ ExternalProject_Add(fmt
   CMAKE_ARGS -D CMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/install
 	     -D CMAKE_BUILD_TYPE=RelWithDebInfo
          -D CMAKE_CXX_VISIBILITY_PRESET=hidden
+         # Explicilty set LIBDIR to 'lib' so for single linux
+         # builds (CentOS 7) we don't put the libraries under
+         # `lib64` which is not a default search path for
+         # find_package() when we later consume this cbdep.
+         -D CMAKE_INSTALL_LIBDIR=lib
          -D CMAKE_POSITION_INDEPENDENT_CODE=ON
 
   BUILD_COMMAND ${CMAKE_COMMAND} --build . --parallel ${_parallelism}