Fix macOS 15 dark theme menu icons (#988)

Author: awawa-dev

.github/workflows/push-master.yml

@@ -142,7 +142,7 @@ jobs:
       matrix:
         include:        
           - JOB_RUNNER: macos-14
-            JOB_NAME: macOS 14 (arm64/M1/M2)
+            JOB_NAME: macOS 14 (arm64 = M1/M2/M3/M4)
             QT_VERSION: 6
             NICE_NAME: arm64_M1_M2
           - JOB_RUNNER: macos-13

CMakeLists.txt

@@ -200,13 +200,10 @@ if ( "${PLATFORM}" MATCHES "osx" )
 	if (CMAKE_OSX_DEPLOYMENT_TARGET)
 		set(CMAKE_OSX_HYPERHDR_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET})
 	else()
-		set(VERSION_REPLACEMENT ${CMAKE_OSX_SYSROOT})
-		string(REPLACE "/SDKs/MacOSX" "." VERSION_REPLACEMENT ${VERSION_REPLACEMENT})
-		string(REPLACE "." ";" VERSION_REPLACEMENT_LIST ${VERSION_REPLACEMENT})
-		list(LENGTH VERSION_REPLACEMENT_LIST VERSION_REPLACEMENT_LIST_LENGTH)
-		if (${VERSION_REPLACEMENT_LIST_LENGTH} GREATER_EQUAL 1)
-			list (GET VERSION_REPLACEMENT_LIST 1 CMAKE_OSX_HYPERHDR_DEPLOYMENT_TARGET)
-		endif()		
+		string(REGEX MATCH "MacOSX([0-9]+)" _ ${CMAKE_OSX_SYSROOT}) 
+		if (${CMAKE_MATCH_COUNT} EQUAL "1")
+			set(CMAKE_OSX_HYPERHDR_DEPLOYMENT_TARGET ${CMAKE_MATCH_1})
+		endif()
 	endif(CMAKE_OSX_DEPLOYMENT_TARGET)
 
 	if (CMAKE_OSX_HYPERHDR_DEPLOYMENT_TARGET)

build.sh

@@ -115,7 +115,7 @@ if [[ "$CI_NAME" == 'osx' || "$CI_NAME" == 'darwin' ]]; then
 		if [[ $(uname -m) == 'arm64' ]]; then
 			BUILD_OPTION=""
 		else
-			BUILD_OPTION="-DUSE_PRECOMPILED_HEADERS=OFF"
+			BUILD_OPTION="-DUSE_PRECOMPILED_HEADERS=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"
 			export CCACHE_COMPILERCHECK=content
 		fi
 	else
@@ -129,7 +129,7 @@ if [[ "$CI_NAME" == 'osx' || "$CI_NAME" == 'darwin' ]]; then
 	ls -a build/.ccache
 	cd build
 	ccache -z -d ./.ccache || true
-	cmake -DPLATFORM=${PLATFORM} ${BUILD_OPTION} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ../ || exit 2
+	cmake -DPLATFORM=${PLATFORM} ${BUILD_OPTION} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ../ || exit 2
 	make -j $(sysctl -n hw.ncpu) || exit 3
 	sudo cpack || exit 3
 	ccache -sv -d ./.ccache || true

include/systray/Systray.h

@@ -66,6 +66,10 @@ struct SystrayMenu
 	void SystrayClose();
 #endif
 
+#ifdef __APPLE__
+	bool SystrayDarkmode();
+#endif
+
 #ifdef _WIN32
 	HWND SystrayGetWindow();
 #endif