Skip to content

Commit ff5b1b6

Browse files
committed
Make it possible to incrementally supply OSC_NOTARIZATION/OSC_CODESIGN variables without over-caching
1 parent e1e7747 commit ff5b1b6

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

packaging/MacOS/Packaging.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ endif()
6464
if(OSC_CODESIGN_ENABLED)
6565
set(OSC_CODESIGN_DEVELOPER_ID "$ENV{OSC_CODESIGN_DEVELOPER_ID}" CACHE STRING "The developer ID string for the codesigning key (e.g. 'Developer ID Application: Some Developer (XYA12398BF)'). Get it with `security find-identity -p codesigning -v`")
6666
if(NOT OSC_CODESIGN_DEVELOPER_ID)
67+
unset(OSC_CODESIGN_DEVELOPER_ID UNSET)
6768
message(FATAL_ERROR "OSC_CODESIGN_DEVELOPER_ID must be set if OSC_CODESIGN_ENABLED is on")
6869
endif()
6970

@@ -95,12 +96,15 @@ if(OSC_NOTARIZATION_ENABLED)
9596
set(OSC_NOTARIZATION_PASSWORD "$ENV{OSC_NOTARIZATION_PASSWORD}" CACHE STRING "App-specific password of the signer (you can create this from your apple ID account)")
9697

9798
if(NOT OSC_NOTARIZATION_APPLE_ID)
99+
unset(OSC_NOTARIZATION_APPLE_ID CACHE)
98100
message(FATAL_ERROR "OSC_NOTARIZATION_APPLE_ID must be set if OSC_NOTARIZATION_ENABLED is on")
99101
endif()
100102
if(NOT OSC_NOTARIZATION_TEAM_ID)
103+
unset(OSC_NOTARIZATION_TEAM_ID CACHE)
101104
message(FATAL_ERROR "OSC_NOTARIZATION_TEAM_ID must be set if OSC_NOTARIZATION_ENABLED is on")
102105
endif()
103106
if(NOT OSC_NOTARIZATION_PASSWORD)
107+
unset(OSC_NOTARIZATION_PASSWORD CACHE)
104108
message(FATAL_ERROR "OSC_NOTARIZATION_PASSWORD must be set if OSC_NOTARIZATION_ENABLE is on")
105109
endif()
106110

0 commit comments

Comments
 (0)