Fix qhot on macOS

LithApp · Oct 10, 2023 · 231a085 · 231a085
1 parent 9e3da05
commit 231a085
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -190,7 +190,11 @@ if (LITH_FEATURE_QHOT)
             FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
         )
     else()
-        set(qhot_FULL_BINARY_PATH "${qhot_BINARY_DIR}/${qhot_NAME}")
+        if (APPLE)
+            set(qhot_FULL_BINARY_PATH "${qhot_BINARY_DIR}/${qhot_NAME}.app/Contents/MacOS/${qhot_NAME}")
+        else()
+            set(qhot_FULL_BINARY_PATH "${qhot_BINARY_DIR}/${qhot_NAME}")
+        endif()
         set_target_properties(Lith-qhot PROPERTIES
             LINKER_LANGUAGE NONE
             OUTPUT_NAME Lith-qhot.sh

diff --git a/dist/Lith-qhot.sh.in b/dist/Lith-qhot.sh.in
@@ -2,4 +2,4 @@
 
 export QT_ASSUME_STDERR_HAS_CONSOLE=1
 
-"@qhot_FULL_BINARY_PATH@" --profile-path "@CMAKE_SOURCE_DIR@/dist/qhot-profile.json" "@CMAKE_SOURCE_DIR@//modules/Lith/UI/MainView.qml"
+"@qhot_FULL_BINARY_PATH@" --profile-path "@CMAKE_SOURCE_DIR@/dist/qhot-profile.json" "@CMAKE_SOURCE_DIR@/modules/Lith/UI/MainView.qml"
diff --git a/dist/qhot-profile.json b/dist/qhot-profile.json
@@ -1,6 +1,6 @@
 {
-    "import-path": ["../../../modules"],
-    "plugin-path": ["../../../modules"],
+    "import-path": ["../../../modules", "../../../../../../modules"],
+    "plugin-path": ["../../../modules", "../../../../../../modules"],
     "quick-controls-conf": "../assets/qtquickcontrols2.conf",
     "app-name": "Lith"
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		export QT_ASSUME_STDERR_HAS_CONSOLE=1

		"@qhot_FULL_BINARY_PATH@" --profile-path "@CMAKE_SOURCE_DIR@/dist/qhot-profile.json" "@CMAKE_SOURCE_DIR@//modules/Lith/UI/MainView.qml"
		"@qhot_FULL_BINARY_PATH@" --profile-path "@CMAKE_SOURCE_DIR@/dist/qhot-profile.json" "@CMAKE_SOURCE_DIR@/modules/Lith/UI/MainView.qml"