From fd5006e70f95b99e82233fc09325455aba7df249 Mon Sep 17 00:00:00 2001 From: Syping Date: Thu, 28 Jan 2021 18:39:42 +0100 Subject: [PATCH] CMake: Full macOS Support, macOS CI uses CMake --- .ci/osx_build.sh | 19 ++++++++++--------- .ci/osx_install.sh | 2 +- CMakeLists.txt | 10 ++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.ci/osx_build.sh b/.ci/osx_build.sh index 9b20f78..c579b33 100755 --- a/.ci/osx_build.sh +++ b/.ci/osx_build.sh @@ -8,15 +8,16 @@ mkdir -p build && \ mkdir -p assets && \ cd build && \ -/usr/local/opt/qt/bin/qmake \ - ${QMAKE_FLAGS_QT5} \ - "${QMAKE_BUILD_TYPE}" \ - "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" \ - "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" \ - "DEFINES+=GTA5SYNC_COMMIT=\\\\\\\"${APPLICATION_COMMIT}\\\\\\\"" \ - "DEFINES+=GTA5SYNC_TELEMETRY" \ - "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" \ - ../gta5view.pro && \ +/usr/local/bin/cmake \ + "-DCMAKE_PREFIX_PATH=/usr/local/opt/qt" \ + "${CMAKE_BUILD_TYPE}" \ + "-DFORCE_QT_VERSION=5" \ + "-DGTA5VIEW_BUILDCODE=${PACKAGE_CODE}" \ + "-DGTA5VIEW_APPVER=${APPLICATION_VERSION}" \ + "-DGTA5VIEW_COMMIT=${APPLICATION_COMMIT}" \ + "-DWITH_TELEMETRY=ON" \ + "-DTELEMETRY_WEBURL=https://dev.syping.de/gta5view-userstats/" \ + ../ && \ make -j 4 && \ /usr/local/opt/qt/bin/macdeployqt gta5view.app -dmg && \ cp -Rf gta5view.dmg ../assets/gta5view-osx_${APPLICATION_VERSION}.dmg diff --git a/.ci/osx_install.sh b/.ci/osx_install.sh index 5897e3c..9c5c5f3 100755 --- a/.ci/osx_install.sh +++ b/.ci/osx_install.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash # Install packages -brew upgrade qt +brew upgrade cmake qt diff --git a/CMakeLists.txt b/CMakeLists.txt index 25f5b3f..e16c70c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,16 @@ if(WIN32) res/app.rc ) endif() +if(APPLE) + list(APPEND GTA5VIEW_RESOURCES + res/5sync.icns + ) + set(MACOSX_BUNDLE_BUNDLE_NAME gta5view) + set(MACOSX_BUNDLE_BUNDLE_VERSION 1.10.0) + set(MACOSX_BUNDLE_ICON_FILE 5sync.icns) + set(MACOSX_BUNDLE_GUI_IDENTIFIER de.syping.gta5view) + set_source_files_properties(res/5sync.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") +endif() list(APPEND GTA5VIEW_DEFINES -DGTA5SYNC_CMAKE