more fixes for macos

contrib/macos/uninstaller/CMakeLists.txt

@@ -60,6 +60,9 @@ set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION})
 set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
 set(MACOSX_BUNDLE_COPYRIGHT "© 2020, The Loki Project")
 
+get_target_property(uic_location Qt5::uic IMPORTED_LOCATION)
+get_filename_component(qt_dir ${uic_location} DIRECTORY)
+ 
 if(MACOS_SIGN)
   add_custom_command(TARGET ${PROJECT_NAME}
     POST_BUILD

contrib/macos/uninstaller/main.cpp

@@ -1,7 +1,7 @@
 
 #include <QApplication>
 #include <QMessageBox>
-#include <Foundation.h>
+#include <CoreFoundation/CoreFoundation.h>
 
 int uninstall();
 
@@ -20,7 +20,7 @@ int main(int argc, char * argv[])
     }
     else
     {
-      msgBox.setText("Failed to uninstall lokinet: error code ("+std::to_string(retcode)+")");
+      msgBox.setText("Failed to uninstall lokinet");
     }
     msgBox.exec();
   }
@@ -38,6 +38,6 @@ int uninstall()
   char* args[] = { "-c" , "/opt/lokinet/bin/lokinet_uninstall.sh", nullptr};
   FILE* pipe = NULL;
   
-  return AuthorizationExecuteWithPrivileges(authorizationRef, tool, AuthorizationFlagDefaults, args, &pipe);
+  return AuthorizationExecuteWithPrivileges(authorizationRef, tool, kAuthorizationFlagDefaults, args, &pipe);
 }