From d042648dbe6a10e0995bbc9cf17eac425fc13c7f Mon Sep 17 00:00:00 2001 From: dob205 Date: Wed, 29 Dec 2021 20:33:11 +0100 Subject: [PATCH] Adjusts the macOS specific CMakeLists.txt This should fix the icon setting for macOS bundle for potential Jenkins builds in the future. --- src/mac/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mac/CMakeLists.txt b/src/mac/CMakeLists.txt index 91759690f..f8891cf69 100644 --- a/src/mac/CMakeLists.txt +++ b/src/mac/CMakeLists.txt @@ -18,11 +18,11 @@ # # Pick the bundle icon depending on the release channel -if(RELEASE_BUILD) +if(BUILD_TYPE STREQUAL "release") set(APP_ICON_MACOSX icons/release/86Box.icns) -elseif(BETA_BUILD) +elseif(BUILD_TYPE STREQUAL "beta") set(APP_ICON_MACOSX icons/beta/86Box.icns) -elseif(ALPHA_BUILD) +elseif(BUILD_TYPE STREQUAL "alpha") set(APP_ICON_MACOSX icons/dev/86Box.icns) else() set(APP_ICON_MACOSX icons/branch/86Box.icns) @@ -50,4 +50,4 @@ set_target_properties(86Box #set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES") #set(XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-") -#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/codesign/dev/app.entitlements) \ No newline at end of file +#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/codesign/dev/app.entitlements)