From 0de47dd1eca4aead4257903a622f22d6e1c1f372 Mon Sep 17 00:00:00 2001 From: s0600204 Date: Tue, 2 Mar 2021 23:40:48 +0000 Subject: [PATCH] Pass an install location to the `fmt` build on MacOS Similar to what all the other sections do. Differential Revision: https://code.wildfiregames.com/D2689 This was SVN commit r24987. --- libraries/osx/build-osx-libs.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libraries/osx/build-osx-libs.sh b/libraries/osx/build-osx-libs.sh index bfc4997b77..61b1f1315c 100755 --- a/libraries/osx/build-osx-libs.sh +++ b/libraries/osx/build-osx-libs.sh @@ -902,6 +902,7 @@ pushd fmt > /dev/null if [[ "$force_rebuild" = "true" ]] || [[ ! -e .already-built ]] || [[ "$(<.already-built)" != "$FMT_VERSION" ]] then + INSTALL_DIR="$(pwd)" rm -f .already-built download_lib $LIB_URL $LIB_ARCHIVE @@ -919,13 +920,10 @@ then (cmake .. \ -DFMT_TEST=False \ -DFMT_DOC=False \ - && make fmt ${JOBS}) || die "fmt build failed" + -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \ + && make fmt ${JOBS} && make install) || die "fmt build failed" + popd - - mkdir -p ../lib - cp build/libfmt.a ../lib/ - cp -r include ../include - popd echo "$FMT_VERSION" > .already-built else