forked from mirrors/0ad
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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user