Switching the mac CI to qt6 (#2612)

* try switching the mac CI to qt6; remove the cmake hardcoded deploy, use macdeployqt instead

* mac: Try to mode kvilib and modules to Contents/Frameworks for macdeployqt to pick them up

* Add Mattoje's patch

* Just disable python by now

3 files changed, 2 insertions, 56 deletions

diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index ccdfad3fd..e62415626 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -303,40 +303,4 @@ endif()
 install(TARGETS ${KVIRC_BINARYNAME} RUNTIME DESTINATION "${KVIRC_BIN_PATH}")
 if(MSVC)
 	install(FILES $<TARGET_PDB_FILE:${KVIRC_BINARYNAME}> DESTINATION ${KVIRC_BIN_PATH} OPTIONAL)
-endif()
-
-if(APPLE)
-	set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/Contents/Plugins)
-	set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/Contents/Resources)
-	#fixme dirty hack
-	set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins")
-	set(QT_LIBRARY_DIR "${Qt5Widgets_DIR}/../../")
-	get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
-	get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
-
-    # qt5: audio, iconengines, imageformats, mediaservice, platforms, sqldrivers
-    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        FILES_MATCHING
-        PATTERN "*.dSYM" EXCLUDE
-        PATTERN "*_debug.dylib" EXCLUDE
-        PATTERN "audio/*.dylib"
-        PATTERN "iconengines/*.dylib"
-        PATTERN "imageformats/*.dylib"
-        PATTERN "mediaservice/*.dylib"
-        PATTERN "platforms/*.dylib"
-        PATTERN "sqldrivers/*.dylib"
-    )
-
-	install(CODE "
-	    file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths]
-Plugins = Plugins\")
-	    " COMPONENT Runtime)
-
-	install(CODE "
-	    file(GLOB_RECURSE QTPLUGINS
-	      \"${plugin_dest_dir}/*.dylib\")
-	    set(BU_CHMOD_BUNDLE_ITEMS ON)
-	    include(BundleUtilities)
-	    fixup_bundle(\"${CMAKE_INSTALL_PREFIX}\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\" IGNORE_ITEM \"Python;libqsqlodbc.dylib;libqsqlpsql.dylib\")
-	    " COMPONENT Runtime)
-endif()
+endif()
\ No newline at end of file
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index e55571500..f48633919 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -54,9 +54,4 @@ endif()
 
 if(COMPILE_ENCHANT_SUPPORT)
 	subdirs(spellchecker)
-endif()
-
-if(APPLE)
-	# This is a dirty trick ensure we get some code executed after the last module gets installed
-	subdirs(zzz_afterlastmodule)
-endif()
+endif()
\ No newline at end of file
diff --git a/src/modules/zzz_afterlastmodule/CMakeLists.txt b/src/modules/zzz_afterlastmodule/CMakeLists.txt
deleted file mode 100644
index 799da6e5e..000000000
--- a/src/modules/zzz_afterlastmodule/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# CMakeLists.txt for src/modules/zzz_afterlastmodule
-if(APPLE)
-	set(QT_LIBRARY_DIR "${Qt5Widgets_DIR}/../../")
-	get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
-	get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
-
-	install(CODE "
-	    file(GLOB_RECURSE KVIRC_INSTALLED_MODULES
-	      \"${KVIRC_MOD_PATH}/*.so\")
-	    include(BundleUtilities)
-	    fixup_bundle(\"${CMAKE_INSTALL_PREFIX}\" \"\${KVIRC_INSTALLED_MODULES}\" \"${QT_LIBRARY_DIR}\" IGNORE_ITEM Python)
-	    " COMPONENT Runtime)
-endif()