diff options
| author |  ctrlaltca | 2024-03-08 14:33:33 +0100 |
|---|---|---|
| committer |  GitHub | 2024-03-08 14:33:33 +0100 |
| commit | 27f96bbae96e8949e304ea86d41724a1bd3ede64 (patch) | |
| tree | 5e0da2f0836384b1188522a23e0da4da4f458ab9 /src/modules | |
| parent | Fix 2609; while we're at it, make the contextual help work again (#2610) (diff) | |
| download | KVIrc-27f96bbae96e8949e304ea86d41724a1bd3ede64.tar.gz KVIrc-27f96bbae96e8949e304ea86d41724a1bd3ede64.tar.bz2 KVIrc-27f96bbae96e8949e304ea86d41724a1bd3ede64.zip | |
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
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/modules/zzz_afterlastmodule/CMakeLists.txt | 13 |
2 files changed, 1 insertions, 19 deletions
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() |