mirror of https://github.com/oxen-io/lokinet
Revert "Build mac uninstaller as subproject instead of externalproject (#1485)"
This reverts commit e62f04c601
.
This commit is contained in:
parent
e62f04c601
commit
bc62e9dd2d
|
@ -20,7 +20,13 @@ set(MACOS_NOTARIZE_ASC ""
|
|||
|
||||
include(ExternalProject)
|
||||
|
||||
add_subdirectory(${PROJECT_SOURCE_DIR}/contrib/macos/uninstaller)
|
||||
message(STATUS "Building UninstallLokinet.app")
|
||||
|
||||
ExternalProject_Add(lokinet-uninstaller
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/contrib/macos/uninstaller
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR} -DMACOS_SIGN=${MACOS_SIGN_APP}
|
||||
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
|
||||
)
|
||||
|
||||
message(STATUS "Building LokinetGUI.app from ${LOKINET_GUI_REPO} @ ${LOKINET_GUI_CHECKOUT}")
|
||||
|
||||
|
@ -51,6 +57,13 @@ install(DIRECTORY ${PROJECT_BINARY_DIR}/LokinetGUI.app
|
|||
PATTERN "*"
|
||||
)
|
||||
|
||||
install(DIRECTORY ${PROJECT_BINARY_DIR}/UninstallLokinet.app
|
||||
DESTINATION "../../Applications/Lokinet"
|
||||
USE_SOURCE_PERMISSIONS
|
||||
COMPONENT gui
|
||||
PATTERN "*"
|
||||
)
|
||||
|
||||
# copy files that will be later moved by the postinstall script to proper locations
|
||||
install(FILES ${CMAKE_SOURCE_DIR}/contrib/macos/lokinet_macos_daemon_script.sh
|
||||
${CMAKE_SOURCE_DIR}/contrib/macos/network.loki.lokinet.daemon.plist
|
||||
|
|
|
@ -13,7 +13,8 @@ if(CCACHE_PROGRAM)
|
|||
endforeach()
|
||||
endif()
|
||||
|
||||
project(lokinet-uninstaller
|
||||
set(PROJECT_NAME lokinet-uninstaller)
|
||||
project(${PROJECT_NAME}
|
||||
VERSION 0.0.1
|
||||
DESCRIPTION "lokinet uninstaller for macos"
|
||||
LANGUAGES CXX)
|
||||
|
@ -53,7 +54,7 @@ set_target_properties(${PROJECT_NAME}
|
|||
set(MACOSX_BUNDLE_BUNDLE_NAME UninstallLokinet)
|
||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.lokinet.lokinet-uninstaller)
|
||||
set(MACOSX_BUNDLE_INFO_STRING "Lokinet uninstaller")
|
||||
set(MACOSX_BUNDLE_ICON_FILE ${CMAKE_CURRENT_BINARY_DIR}/lokinet-uninstall.icns)
|
||||
set(MACOSX_BUNDLE_ICON_FILE lokinet-uninstall.icns)
|
||||
set(MACOSX_BUNDLE_LONG_VERSION_STRING ${PROJECT_VERSION})
|
||||
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION})
|
||||
set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
|
||||
|
@ -78,7 +79,7 @@ else()
|
|||
)
|
||||
endif()
|
||||
|
||||
install(TARGETS ${PROJECT_NAME}
|
||||
DESTINATION "../../Applications/Lokinet"
|
||||
COMPONENT gui
|
||||
)
|
||||
install(TARGETS lokinet-uninstaller
|
||||
RUNTIME DESTINATION bin
|
||||
BUNDLE DESTINATION .
|
||||
RESOURCE DESTINATION .)
|
||||
|
|
Loading…
Reference in New Issue