Revert "res"

This reverts commit c988f71.
LibreCAD · Sep 9, 2023 · aa291c3 · aa291c3
1 parent c988f71
commit aa291c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,13 +44,12 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/conan_toolchain.cmake")
     SET(CPACK_NSIS_INSTALLED_ICON_NAME "${CMAKE_SOURCE_DIR}/res/librecad.ico")
     SET(CPACK_NSIS_PACKAGE_NAME "LibreCAD3")
     set(CPACK_CREATE_DESKTOP_LINKS "LibreCAD3")
-    set(CPACK_PACKAGE_EXECUTABLES "librecad;LibreCAD3")
+    set(CPACK_PACKAGE_EXECUTABLES "librecad.exe;LibreCAD3")
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "LibreCAD3")
     set(CPACK_PACKAGE_NAME "LibreCAD3")
-    set(CPACK_INSTALL_CMAKE_PROJECTS "build/bin;LibreCAD3;ALL;/")
+    set(CPACK_INSTALL_CMAKE_PROJECTS "build/bin/Release;LibreCAD3;ALL;/")
     set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
     file(COPY "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION "${FINAL_INSTALL_DIR}")
-    string(REPLACE "/DNDEBUG" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
     include(CPack)
 
     #include(${CMAKE_SOURCE_DIR}/conan_toolchain.cmake)

diff --git a/lcUI/CMakeLists.txt b/lcUI/CMakeLists.txt
@@ -311,10 +311,9 @@ install(TARGETS librecad DESTINATION "${CMAKE_INSTALL_BINDIR}")
 if (NOT MSVC)
 	install(DIRECTORY "${CMAKE_SOURCE_DIR}/lcUI/ui" DESTINATION "usr/share/librecad/lcUI")
 else()
-	install(TARGETS librecad DESTINATION "${CMAKE_INSTALL_BINDIR}")
-	install(DIRECTORY "${CMAKE_SOURCE_DIR}/lcUI/ui" DESTINATION "${FINAL_INSTALL_DIR}/lcUI")
+	install(TARGETS librecad DESTINATION "${FINAL_INSTALL_DIR}")
+	install(DIRECTORY "${CMAKE_SOURCE_DIR}/build/bin/lcUI/ui" DESTINATION "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}")
-message(SETTINGS_PATH="${SETTINGS_PATH}")
 
diff --git a/lckernel/CMakeLists.txt b/lckernel/CMakeLists.txt
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.6...3.27)
 project(LCKERNEL)
 
 #TODO: Fix this
-set(PATTERN_RESOURCE_PATH "${CMAKE_SOURCE_DIR}/res/hatch")
+set(PATTERN_RESOURCE_PATH ${CMAKE_SOURCE_DIR}/res/hatch)
 if (MSVC)
-	message(FINAL_INSTALL_DIR="${FINAL_INSTALL_DIR}/res")
-	install(DIRECTORY "${PATTERN_RESOURCE_PATH}" TYPE  DATA DESTINATION "res" )
+install(DIRECTORY "${PATTERN_RESOURCE_PATH}"
+    DESTINATION "${FINAL_INSTALL_DIR}/res" )
 else()
-	install(DIRECTORY "${PATTERN_RESOURCE_PATH}" TYPE DATA
+install(DIRECTORY "${PATTERN_RESOURCE_PATH}"
     DESTINATION "${FINAL_INSTALL_DIR}/usr/share/librecad" )
 endif()