mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-27 20:58:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

more macOS build fixes

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2023-12-08 14:52:14 -08:00
parent b070b32e93
commit 3a98b8a722
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/mac.yml vendored
View file

@ -48,7 +48,9 @@ jobs:
run: | run: |
# build export-html to make sure that didn't get broken # build export-html to make sure that didn't get broken
cd ${GITHUB_WORKSPACE}/build cd ${GITHUB_WORKSPACE}/build
make export-html cmake -DMAKE_TESTS=ON
make -j
make -j export-html
echo "------------------------------------" echo "------------------------------------"
echo "run tests for desktop build" echo "run tests for desktop build"
export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64 export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64

8
packaging/macosx/make-package.sh
View file

@ -31,7 +31,13 @@ BASESDK=$(ls $SDKROOT | grep "MacOSX1.*\.sdk" | head -1 | sed -e "s/MacOSX//;s/\
OLDER_MAC_CMAKE="-DCMAKE_OSX_DEPLOYMENT_TARGET=${BASESDK} -DCMAKE_OSX_SYSROOT=${SDKROOT}/MacOSX${BASESDK}.sdk/" OLDER_MAC_CMAKE="-DCMAKE_OSX_DEPLOYMENT_TARGET=${BASESDK} -DCMAKE_OSX_SYSROOT=${SDKROOT}/MacOSX${BASESDK}.sdk/"
export PKG_CONFIG_PATH=${DIR}/install-root/lib/pkgconfig:$PKG_CONFIG_PATH export PKG_CONFIG_PATH=${DIR}/install-root/lib/pkgconfig:$PKG_CONFIG_PATH
cmake $OLDER_MAC_CMAKE . cmake $OLDER_MAC_CMAKE \
-DLIBGIT2_FROM_PKGCONFIG=ON \
-DLIBGIT2_DYNAMIC=ON \
-DFTDISUPPORT=ON \
-DMAKE_TESTS=Off \
.
LIBRARY_PATH=${DIR}/install-root/lib make -j LIBRARY_PATH=${DIR}/install-root/lib make -j
LIBRARY_PATH=${DIR}/install-root/lib make install LIBRARY_PATH=${DIR}/install-root/lib make install

2
scripts/build.sh
View file

@ -610,7 +610,7 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do
EXTRA_OPTS="-DNO_USERMANUAL=ON -DNO_PRINTING=ON" EXTRA_OPTS="-DNO_USERMANUAL=ON -DNO_PRINTING=ON"
fi fi
if [ "$FTDI" = "1" ] ; then if [ "$FTDI" = "1" ] ; then
EXTRA_OPTSi="$EXTRA_OPTS -DFTDISUPPORT" EXTRA_OPTSi="$EXTRA_OPTS -DFTDISUPPORT=ON"
fi fi
if [ "$BUILD_WITH_QT6" = "1" ] ; then if [ "$BUILD_WITH_QT6" = "1" ] ; then
EXTRA_OPTS="$EXTRA_OPTS -DBUILD_WITH_QT6=ON" EXTRA_OPTS="$EXTRA_OPTS -DBUILD_WITH_QT6=ON"