mac: Try to mode kvilib and modules to Contents/Frameworks for macdep…

…loyqt to pick them up
kvirc · Mar 4, 2024 · f0c5024 · f0c5024
1 parent 5f96ab5
commit f0c5024
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Deployt Qt
         run: |
           cd '${{github.workspace}}'
-          macdeployqt "build/KVIrc.app" -libpath=build/KVIrc.app/Contents/MacOS
+          macdeployqt "build/KVIrc.app"
 
       - name: Detect version
         shell: bash

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -324,6 +324,7 @@ endif()
 if(UNIX)
 	if(APPLE)
 		set(CMAKE_KVIRC_RESOURCES_DIR "${CMAKE_INSTALL_PREFIX}/Contents/Resources/")
+		set(CMAKE_KVIRC_MODULES_DIR "${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/modules/")
 	else()
 		# Assume GNU/Linux
 		set(CMAKE_KVIRC_RESOURCES_DIR "${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/")
@@ -1310,7 +1311,7 @@ endif()
 # KviLib path
 if(UNIX)
 	if(APPLE)
-		set(KVIRC_LIB_PATH ${CMAKE_INSTALL_PREFIX}/Contents/MacOS/)
+		set(KVIRC_LIB_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/)
 	else()
 		# Assume Linux
 		set(KVIRC_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/)
@@ -1322,7 +1323,7 @@ endif()
 # Modules path
 if(UNIX)
 	if(APPLE)
-		set(KVIRC_MOD_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/)
+		set(KVIRC_MOD_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/modules/)
 	else()
 		# Assume GNU/Linux
 		set(KVIRC_MOD_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/kvirc/${VERSION_BRANCH}/modules/)