From 56b9972053e21837c5ec8947a201f59ad413fd10 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Tue, 29 Nov 2022 22:44:29 +0300 Subject: [PATCH] build script for macos now uses cmake --- client/CMakeLists.txt | 1 + deploy/build_macos.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 8e8acb2d..e07ef56b 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -163,6 +163,7 @@ if(WIN32) endif() if(APPLE) + set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE INTERNAL "" FORCE) if(NOT BUILD_OSX_APP_IDENTIFIER) set(BUILD_OSX_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "OSX Application identifier") diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index fa955215..869a1ccc 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -49,16 +49,18 @@ echo "Using QIF in $QIF_BIN_DIR" # Checking env -$QT_BIN_DIR/qmake -v -make -v +$QT_BIN_DIR/qt-cmake --version +cmake --version clang -v # Build App echo "Building App..." cd $BUILD_DIR -$QT_BIN_DIR/qmake $PROJECT_DIR/AmneziaVPN.pro 'CONFIG+=release CONFIG+=x86_64' -make -j `sysctl -n hw.ncpu` +$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -B $BUILD_DIR +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