data dir

LibreCAD · Sep 12, 2023 · 7fcbcf0 · 7fcbcf0
1 parent 6994238
commit 7fcbcf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lcUI/CMakeLists.txt b/lcUI/CMakeLists.txt
@@ -308,11 +308,11 @@ endif()
 
 # INSTALLATION
 install(TARGETS librecad DESTINATION "${CMAKE_INSTALL_BINDIR}")
-if (NOT MSVC)
-	install(DIRECTORY "${CMAKE_SOURCE_DIR}/lcUI/ui" DESTINATION "usr/share/librecad/lcUI")
+if (MSVC)
+    install(TARGETS librecad DESTINATION "${FINAL_INSTALL_DIR}")
+    install(DIRECTORY "${CMAKE_SOURCE_DIR}/build/bin/lcUI/ui" DESTINATION "lcUI")
 else()
-	install(TARGETS librecad DESTINATION "${FINAL_INSTALL_DIR}")
-	install(DIRECTORY "${CMAKE_SOURCE_DIR}/build/bin/lcUI/ui" DESTINATION "lcUI")
+    install(DIRECTORY "${CMAKE_SOURCE_DIR}/lcUI/ui" DESTINATION "usr/share/librecad/lcUI")
 endif()
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/default_ui_settings.json" DESTINATION "${SETTINGS_PATH}")
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/settings_schema.json" DESTINATION "${SETTINGS_PATH}")

diff --git a/lckernel/CMakeLists.txt b/lckernel/CMakeLists.txt
@@ -6,7 +6,7 @@ set(PATTERN_RESOURCE_PATH ${CMAKE_SOURCE_DIR}/res/hatch)
 if (MSVC)
     install(DIRECTORY "${PATTERN_RESOURCE_PATH}" DESTINATION "res")
 else()
-    install(DIRECTORY "${PATTERN_RESOURCE_PATH}" DESTINATION "${FINAL_INSTALL_DIR}/usr/share/librecad")
+    install(DIRECTORY "${PATTERN_RESOURCE_PATH}" DESTINATION "${CMAKE_INSTALL_DATADIR}/librecad")
 endif()
 
 #Include TinySpline