build script for macos now uses cmake

This commit is contained in:
vladimir.kuznetsov 2022-11-29 22:44:29 +03:00
parent 1335c94bbc
commit 56b9972053
2 changed files with 7 additions and 4 deletions

View file

@ -163,6 +163,7 @@ if(WIN32)
endif() endif()
if(APPLE) if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE INTERNAL "" FORCE)
if(NOT BUILD_OSX_APP_IDENTIFIER) if(NOT BUILD_OSX_APP_IDENTIFIER)
set(BUILD_OSX_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "OSX Application identifier") set(BUILD_OSX_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "OSX Application identifier")

View file

@ -49,16 +49,18 @@ echo "Using QIF in $QIF_BIN_DIR"
# Checking env # Checking env
$QT_BIN_DIR/qmake -v $QT_BIN_DIR/qt-cmake --version
make -v cmake --version
clang -v clang -v
# Build App # Build App
echo "Building App..." echo "Building App..."
cd $BUILD_DIR cd $BUILD_DIR
$QT_BIN_DIR/qmake $PROJECT_DIR/AmneziaVPN.pro 'CONFIG+=release CONFIG+=x86_64' $QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -B $BUILD_DIR
make -j `sysctl -n hw.ncpu` cmake --build . --config release
# $QT_BIN_DIR/qmake $PROJECT_DIR/AmneziaVPN.pro 'CONFIG+=release CONFIG+=x86_64'
# make -j `sysctl -n hw.ncpu`
# Build and run tests here # Build and run tests here