ci: update for new structure

This commit is contained in:
itsmattkc
2021-04-22 11:50:24 +10:00
parent 3929004535
commit 83d44570c1
3 changed files with 16 additions and 15 deletions
+3 -3
View File
@@ -83,13 +83,13 @@ elseif(APPLE)
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macos/MacOSXBundleInfo.plist.in
MACOSX_BUNDLE_GUI_IDENTIFIER org.olivevideoeditor.Olive
MACOSX_BUNDLE_ICON_FILE olive.icns
RESOURCE "${OLIVE_ICON}"
RESOURCE "${OLIVE_ICON}" libolive-editor
OUTPUT_NAME "Olive"
)
elseif(UNIX)
# Set Linux-specific properties for application
#install(TARGETS olive-editor RUNTIME DESTINATION bin)
#install(TARGETS libolive-editor RUNTIME DESTINATION lib)
install(TARGETS olive-editor RUNTIME DESTINATION bin)
install(TARGETS libolive-editor RUNTIME DESTINATION lib)
endif()
# Set link libraries
-1
View File
@@ -52,7 +52,6 @@ if(APPLE)
# Move crash handler executables inside Mac app bundle
add_custom_command(TARGET olive-crashhandler POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different olive-crashhandler $<TARGET_FILE_DIR:olive-editor>
COMMAND ${CMAKE_COMMAND} -E copy_if_different libolive-editor $<TARGET_FILE_DIR:olive-editor>
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CRASHPAD_LIBRARY_DIRS}/${CRASHPAD_HANDLER} $<TARGET_FILE_DIR:olive-editor>
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${BREAKPAD_BIN_DIR}/${MINIDUMP_STACKWALK} $<TARGET_FILE_DIR:olive-editor>
)