Skip to content

Commit

Permalink
[macos] move files to the new subdir
Browse files Browse the repository at this point in the history
  • Loading branch information
kambala-decapitator committed Aug 4, 2024
1 parent f4ea76e commit 7c73c6f
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ string(TIMESTAMP currentYear "%Y")
set(copyrightYears "2016-${currentYear}")
set_target_properties(LibreELEC.USB-SD.Creator PROPERTIES
# TODO: use Qt's template (<QTDIR>/lib/cmake/Qt6/macos/Info.plist.app.in) once we support dark mode properly
MACOSX_BUNDLE_INFO_PLIST "dmg_osx/Info.plist.in"
MACOSX_BUNDLE_INFO_PLIST "macos/Info.plist.in"
MACOSX_BUNDLE_BUNDLE_NAME "${projectDisplayName}"
MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}"
MACOSX_BUNDLE_COPYRIGHT "LibreELEC © ${copyrightYears}"
Expand Down Expand Up @@ -164,7 +164,7 @@ elseif(APPLE)
macos/askpass.cpp macos/askpass.h
)

install(FILES "dmg_osx/icon.icns"
install(FILES "macos/dmg_osx/icon.icns"
DESTINATION "$<TARGET_BUNDLE_CONTENT_DIR:LibreELEC.USB-SD.Creator>/Resources"
)

Expand All @@ -178,7 +178,7 @@ elseif(APPLE)
endforeach()
# codesign
execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/dmg_osx/codesign.sh\"
execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/macos/codesign.sh\"
WORKING_DIRECTORY \"\\\${bundleContentsDir}\"
)
")
Expand Down Expand Up @@ -232,15 +232,15 @@ elseif(APPLE)

set(notarizeScript "${CMAKE_BINARY_DIR}/notarize.cmake")
file(WRITE "${notarizeScript}"
"execute_process(COMMAND sh -c \"${CMAKE_SOURCE_DIR}/dmg_osx/notarize.sh \${CPACK_PACKAGE_FILES}\")"
"execute_process(COMMAND sh -c \"${CMAKE_SOURCE_DIR}/macos/notarize.sh \${CPACK_PACKAGE_FILES}\")"
)
set(CPACK_POST_BUILD_SCRIPTS "${notarizeScript}")

set(CPACK_GENERATOR DragNDrop)
set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/dmg_osx/background.png")
set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/macos/dmg_osx/background.png")
set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "DS_Store_Setup.scpt")
set(CPACK_DMG_VOLUME_NAME "${projectDisplayName}")

configure_file("dmg_osx/DS_Store_Setup.scpt.in" "${CPACK_DMG_DS_STORE_SETUP_SCRIPT}" @ONLY)
configure_file("macos/dmg_osx/DS_Store_Setup.scpt.in" "${CPACK_DMG_DS_STORE_SETUP_SCRIPT}" @ONLY)
endif()
include(CPack)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7c73c6f

Please sign in to comment.