From 7fcbcf086d93044aa6319b1d79d032d80925fb47 Mon Sep 17 00:00:00 2001 From: Dongxu Li Date: Tue, 12 Sep 2023 16:08:01 -0400 Subject: [PATCH] data dir --- lcUI/CMakeLists.txt | 8 ++++---- lckernel/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lcUI/CMakeLists.txt b/lcUI/CMakeLists.txt index a54172af..578ba303 100644 --- 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 index b3e61d21..c4437bfb 100644 --- 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