Skip to content

Commit 705ae49

Browse files
committed
build(cmake): fix code signing
1 parent 7b13916 commit 705ae49

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

cmake/CodeSign.cmake

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,19 +155,22 @@ function(codesign)
155155
execute_process(COMMAND "certutil.exe" ${_cmd_certutil_args}
156156
RESULT_VARIABLE _rc
157157
OUTPUT_VARIABLE _stdout
158+
# For some reason certutil prints errors to stdout.
158159
# ERROR_VARIABLE _stderr
159160
)
160161

161162
# Remove temporary file first.
162163
file(REMOVE ${_certificate_base64_file})
163164

164165
if(NOT _rc EQUAL 0)
165-
# For some reason certutil prints errors to stdout.
166166
message(WARNING "Failed to decode certificate: ${_stdout}")
167167
_cleanup()
168168
return()
169169
endif()
170170

171+
unset(_rc)
172+
unset(_stdout)
173+
171174
set(_ARG_CERTIFICATE_FILE ${_certificate_file})
172175
else()
173176
message(NOTICE "Certificate is not provided, no binaries will be signed.")
@@ -216,7 +219,7 @@ function(codesign)
216219

217220
# Set timestamp server.
218221
if(NOT _ARG_TIMESTAMP_URL)
219-
set(_ARG_TIMESTAMP_URL "https://timestamp.digicert.com")
222+
set(_ARG_TIMESTAMP_URL "http://timestamp.digicert.com")
220223
endif()
221224

222225
if(_ARG_TIMESTAMP_URL)
@@ -242,6 +245,14 @@ function(codesign)
242245
continue()
243246
endif()
244247

248+
message(STATUS "Signing ${_file}...")
249+
execute_process(
250+
COMMAND "${_cmd}" ${_cmd_args} "${_file}"
251+
RESULT_VARIABLE _rc
252+
OUTPUT_VARIABLE _stdout
253+
ERROR_VARIABLE _stderr
254+
)
255+
245256
if(_rc EQUAL 0)
246257
message(STATUS "Successfully signed: ${_file}")
247258
else()

0 commit comments

Comments
 (0)