Build mac uninstaller as subproject instead of externalproject (#1485)

This makes it easier to build/rebuild via a target, and is a bit
cleaner.

cmake/macos_installer_deps.cmake

@@ -20,13 +20,7 @@ set(MACOS_NOTARIZE_ASC ""
 
 include(ExternalProject)
 
-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}
-)
+add_subdirectory(${PROJECT_SOURCE_DIR}/contrib/macos/uninstaller)
 
 message(STATUS "Building LokinetGUI.app from ${LOKINET_GUI_REPO} @ ${LOKINET_GUI_CHECKOUT}")
 
@@ -57,13 +51,6 @@ 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

contrib/macos/uninstaller/CMakeLists.txt

@@ -13,8 +13,7 @@ if(CCACHE_PROGRAM)
   endforeach()
 endif()
 
-set(PROJECT_NAME lokinet-uninstaller)
-project(${PROJECT_NAME}
+project(lokinet-uninstaller
     VERSION 0.0.1
     DESCRIPTION "lokinet uninstaller for macos"
     LANGUAGES CXX)
@@ -54,7 +53,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 lokinet-uninstall.icns)
+set(MACOSX_BUNDLE_ICON_FILE ${CMAKE_CURRENT_BINARY_DIR}/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})
@@ -79,7 +78,7 @@ else()
     )
 endif()
 
-install(TARGETS lokinet-uninstaller
-    RUNTIME DESTINATION bin
-    BUNDLE DESTINATION .
-    RESOURCE DESTINATION .)
+install(TARGETS ${PROJECT_NAME}
+    DESTINATION "../../Applications/Lokinet"
+    COMPONENT gui
+    )