Skip to content

Commit 288291e

Browse files
committed
Try to fix #745 in the right spot (previous attempt, qtwebenginecore wasn't there yet)
1 parent f804c9a commit 288291e

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

CMake/install_codesign_script_OpenStudioApp.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -299,14 +299,6 @@ codesign_files_macos(
299299
FORCE VERBOSE
300300
)
301301

302-
codesign_files_macos(
303-
FILES ${CMAKE_INSTALL_PREFIX}/OpenStudioApp.app/Contents/Frameworks/QtWebEngineCore.framework/QtWebEngineCore
304-
SIGNING_IDENTITY ${CPACK_CODESIGNING_DEVELOPPER_ID_APPLICATION}
305-
PREFIX "${CPACK_CODESIGNING_MACOS_IDENTIFIER}."
306-
ENTITLEMENTS "${CMAKE_CURRENT_LIST_DIR}/QtWebEngineProcess.entitlements"
307-
FORCE VERBOSE
308-
)
309-
310302
# Clean up to avoid multiple passes (several components) appending to a pre-existing list
311303
unset(FILES_TO_SIGN)
312304
unset(_FULL_PATHS)

src/openstudio_app/CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,4 +547,18 @@ endif()
547547
if(APPLE AND CPACK_CODESIGNING_DEVELOPPER_ID_APPLICATION)
548548
include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/CodeSigning.cmake")
549549
register_install_codesign_target(${target_name} "." "OpenStudioApp")
550+
551+
install(
552+
CODE "
553+
include(\"${CMAKE_CURRENT_FUNCTION_LIST_FILE}\")
554+
codesign_files_macos(
555+
FILES \"\${CMAKE_INSTALL_PREFIX}/$<TARGET_BUNDLE_DIR_NAME:${target_name}>/Contents/Frameworks/QtWebEngineCore.framework/QtWebEngineCore\"
556+
SIGNING_IDENTITY \"${CPACK_CODESIGNING_DEVELOPPER_ID_APPLICATION}\"
557+
IDENTIFIER \"${CPACK_CODESIGNING_MACOS_IDENTIFIER}.QtWebEngineCore\"
558+
ENTITLEMENTS \"${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/QtWebEngineProcess.entitlements\"
559+
FORCE VERBOSE
560+
)
561+
"
562+
COMPONENT OpenStudioApp
563+
)
550564
endif()

0 commit comments

Comments
 (0)