res

LibreCAD · Sep 9, 2023 · 0b13170 · 0b13170
1 parent aa291c3
commit 0b13170
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,10 +44,10 @@ 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.exe;LibreCAD3")
+    set(CPACK_PACKAGE_EXECUTABLES "librecad;LibreCAD3")
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "LibreCAD3")
     set(CPACK_PACKAGE_NAME "LibreCAD3")
-    set(CPACK_INSTALL_CMAKE_PROJECTS "build/bin/Release;LibreCAD3;ALL;/")
+    set(CPACK_INSTALL_CMAKE_PROJECTS "build/bin;LibreCAD3;ALL;/")
     set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
     file(COPY "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION "${FINAL_INSTALL_DIR}")
     include(CPack)

diff --git a/lckernel/CMakeLists.txt b/lckernel/CMakeLists.txt
@@ -4,8 +4,8 @@ project(LCKERNEL)
 #TODO: Fix this
 set(PATTERN_RESOURCE_PATH ${CMAKE_SOURCE_DIR}/res/hatch)
 if (MSVC)
-install(DIRECTORY "${PATTERN_RESOURCE_PATH}"
-    DESTINATION "${FINAL_INSTALL_DIR}/res" )
+install(DIRECTORY "${PATTERN_RESOURCE_PATH}" TYPE DATA
+    DESTINATION } "res" )
 else()
 install(DIRECTORY "${PATTERN_RESOURCE_PATH}"
     DESTINATION "${FINAL_INSTALL_DIR}/usr/share/librecad" )

diff --git a/scripts/windows-install/buildLibrecadAndCreatePackage.bat b/scripts/windows-install/buildLibrecadAndCreatePackage.bat
@@ -22,7 +22,8 @@ dir
 
 WinDeployQt librecad.exe
 dir ..
-copy ..\*.lua ..\*.json .
+copy ..\*.lua
+copy ..\*.json
 where makensis.exe
 dir ..\..\CPack*.cmake