Skip to content

Commit dcc9963

Browse files
svenzikmetsma
andcommitted
Add devtools scripts and views to Safari build
WE2-967 Signed-off-by: Sven Mitt <[email protected]> Update src/mac/CMakeLists.txt Co-authored-by: Raul Metsma <[email protected]> Update src/mac/CMakeLists.txt Co-authored-by: Raul Metsma <[email protected]>
1 parent 92ac629 commit dcc9963

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/mac/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ find_program(NPM_EXECUTABLE NAMES npm REQUIRED)
99
get_filename_component(BINPATH ${NPM_EXECUTABLE} PATH)
1010
set(JSPATH ${CMAKE_CURRENT_SOURCE_DIR}/js/dist/safari)
1111
set(EXTENSION ${JSPATH}/manifest.json ${JSPATH}/background.js ${JSPATH}/content.js ${JSPATH}/background.js.map ${JSPATH}/web-eid-icon-128.png)
12+
file(GLOB_RECURSE EXTENSION_DEVTOOLS "${JSPATH}/views/*")
1213
add_custom_command(OUTPUT ${EXTENSION}
1314
COMMAND ${CMAKE_COMMAND} -E env PATH="$ENV{PATH}:${BINPATH}" ${NPM_EXECUTABLE} install
1415
COMMAND ${CMAKE_COMMAND} -E env PATH="$ENV{PATH}:${BINPATH}" TOKEN_SIGNING_BACKWARDS_COMPATIBILITY=true ${NPM_EXECUTABLE} run clean build
@@ -17,7 +18,7 @@ add_custom_command(OUTPUT ${EXTENSION}
1718
)
1819

1920
# Extension
20-
add_executable(web-eid-safari-extension MACOSX_BUNDLE safari-extension.mm web-eid-safari-extension.entitlements ${EXTENSION})
21+
add_executable(web-eid-safari-extension MACOSX_BUNDLE safari-extension.mm web-eid-safari-extension.entitlements ${EXTENSION} ${EXTENSION_DEVTOOLS})
2122
set_target_properties(web-eid-safari-extension PROPERTIES
2223
AUTOMOC OFF
2324
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info-extension.plist.cmake
@@ -29,8 +30,10 @@ set_target_properties(web-eid-safari-extension PROPERTIES
2930
target_link_libraries(web-eid-safari-extension SafariServices "-framework AppKit")
3031
target_link_options(web-eid-safari-extension PRIVATE -e _NSExtensionMain -fapplication-extension)
3132
add_custom_command(TARGET web-eid-safari-extension POST_BUILD
32-
COMMAND mkdir -p $<TARGET_BUNDLE_CONTENT_DIR:web-eid-safari-extension>/Resources
33+
COMMAND mkdir -p $<TARGET_BUNDLE_CONTENT_DIR:web-eid-safari-extension>/Resources/views
3334
COMMAND cp ${EXTENSION} $<TARGET_BUNDLE_CONTENT_DIR:web-eid-safari-extension>/Resources
35+
COMMAND cp ${JSPATH}/views/options.html ${JSPATH}/views/options.js ${JSPATH}/views/browser-polyfill.min.js $<TARGET_BUNDLE_CONTENT_DIR:web-eid-safari-extension>/Resources/views
36+
COMMAND ${CMAKE_COMMAND} -E copy_directory ${JSPATH}/views/devtools $<TARGET_BUNDLE_CONTENT_DIR:web-eid-safari-extension>/Resources/views/devtools
3437
)
3538

3639
# Application

0 commit comments

Comments
 (0)