merge ci_dev

scripts/windows-install/createConanDirAndInstallDependencies.bat

.github/workflows/main.yml

@@ -70,6 +70,11 @@ jobs:
 
       - run: setx QT_QPA_PLATFORM_PLUGIN_PATH "${{ env.Qt5_DIR }}\plugins\platforms\"
 
+      - run: setx QT_QPA_PLATFORM_PLUGIN_PATH "${{ env.Qt5_DIR }}\plugins\platforms\"
+      - run: setx QTDIR "${{ env.Qt5_DIR }}\5.15.2\msvc2019_64"
+
+      - run: setx QT_QPA_PLATFORM_PLUGIN_PATH "${{ env.Qt5_DIR }}\plugins\platforms\"
+
       - run: ${{ github.workspace }}/scripts/windows-install/addPathVariables.ps1
 
       - run: cd ${{ github.workspace }}
@@ -79,5 +84,5 @@ jobs:
       - name: Uploading exe
         uses: actions/[email protected]
         with:
-          path: '${{ github.workspace }}/out/build/windows-default/LibreCAD3**.exe'
+          path: '${{ github.workspace }}/build/bin/LibreCAD3**.exe'
           name: LibreCAD3.exe

CMakeLists.txt

@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.8...3.27)
-project(LC)
+if (MSVC)
+    project(LibreCAD3)
+else()
+    project(LC)
+endif()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -19,12 +23,36 @@ option(WITH_PERSISTENCE "Build dxf/dwg support" ON)
 # Define compiler warnings
 if (NOT MSVC) # Too much warnings on MSVC
      add_definitions("-Wall")
+     include(GNUInstallDirs)
 endif()
 
-include(GNUInstallDirs)
 set(FINAL_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
 
 if(EXISTS "${CMAKE_SOURCE_DIR}/conan_toolchain.cmake")
+	#set(FINAL_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
+    set(FINAL_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
+    set(CMAKE_INSTALL_BINDIR "bin")
+
+    #SET(CPACK_GENERATOR "ZIP;TGZ")
+    SET(CPACK_BINARY_NSIS True)
+    SET(CPACK_NSIS_DISPLAY_NAME "LibreCAD3")
+    set(CPACK_NSIS_PACKAGE_NAME "LibreCAD3")
+    set(CPACK_PACKAGE_VENDOR "librecad.org")
+    set(CPACK_PACKAGE_NAME "LibreCAD3")
+    set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${CMAKE_SOURCE_DIR}/build/bin;.")
+    set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}/build/bin")
+
+    #SET(CPACK_NSIS_INSTALLED_ICON_NAME "${CMAKE_SOURCE_DIR}/build/bin/librecad.exe")
+    SET(CPACK_NSIS_PACKAGE_NAME "LibreCAD3")
+    set(CPACK_CREATE_DESKTOP_LINKS "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/Release;LibreCAD3;ALL;/")
+    set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+    file(COPY "${CMAKE_SOURCE_DIR}/LICENSE" DESTINATION "${FINAL_INSTALL_DIR}")
+    include(CPack)
+
     #include(${CMAKE_SOURCE_DIR}/conan_toolchain.cmake)
     set(CMAKE_FIND_LIBRARY_PREFIXES "" "lib")
 
@@ -125,7 +153,7 @@ if(MSVC)
     #SET(Boost_USE_STATIC_LIBS ON)
     FIND_PACKAGE(Boost COMPONENTS log log_setup REQUIRED)
     find_package(Eigen3 REQUIRED)
-    message(eigen3:="${Eigen3_INCLUDE_DIR}")
+    include_directories("${Eigen3_INCLUDE_DIR}")
     include_directories("${Eigen3_INCLUDE_DIR}")
     message("${CMAKE_SOURCE_DIR}/include")
     include_directories("third_party/msvc_dirent")

lcUI/CMakeLists.txt

@@ -12,6 +12,7 @@ set(CMAKE_AUTORCC ON)
 
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
+
 set(QT_USE_QTOPENGL TRUE)
 
 find_package(Qt5Widgets)
@@ -295,8 +296,19 @@ if (MSVC)
     target_link_libraries(librecad Boost::log Boost::system GLEW::GLEW)
 endif()
 
+if (MSVC)
+    target_link_libraries(librecad Boost::log Boost::system GLEW::GLEW)
+    message(CMAKE_INSTALL_BINDIR="${CMAKE_INSTALL_BINDIR}")
+endif()
+
 # INSTALLATION
 install(TARGETS librecad DESTINATION "${CMAKE_INSTALL_BINDIR}")
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/lcUI/ui" DESTINATION "usr/share/librecad/lcUI")
+if (NOT MSVC)
+	install(DIRECTORY "${CMAKE_SOURCE_DIR}/lcUI/ui" DESTINATION "usr/share/librecad/lcUI")
+else()
+	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}")
+

lcUILua/CMakeLists.txt

@@ -8,7 +8,19 @@ file(WRITE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/path.lua"
 	"plugin_path='${PROJECT_SOURCE_DIR}/lcUILua/plugins' \n"
     "lua_path='${PROJECT_SOURCE_DIR}/lcUILua'"
 )
+if (MSVC)
+    install(CODE "file(WRITE \"${FINAL_INSTALL_DIR}/${CMAKE_INSTALL_BINDIR}/path.lua\"
+        \"package.path = package.path .. ';${FINAL_INSTALL_DIR}/lcUILua/?.lua' \n\"
+        \"ui_path='${FINAL_INSTALL_DIR}/lcUI/ui' \n\"
+        \"plugin_path='${FINAL_INSTALL_DIR}/lcUILua/plugins' \n\"
+        \"lua_path='${PROJECT_SOURCE_DIR}/lcUILua'\"
+    )")
 
+    install(DIRECTORY "${CMAKE_SOURCE_DIR}/lcUILua"
+            DESTINATION "${FINAL_INSTALL_DIR}/"
+            PATTERN "CMakeLists.txt" EXCLUDE
+    )
+else()
 install(CODE "file(WRITE \"${FINAL_INSTALL_DIR}/${CMAKE_INSTALL_BINDIR}/path.lua\"
 	\"package.path = package.path .. ';${FINAL_INSTALL_DIR}/usr/share/librecad/lcUILua/?.lua' \n\"
 	\"ui_path='${FINAL_INSTALL_DIR}/usr/share/librecad/lcUI/ui' \n\"
@@ -20,3 +32,4 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/lcUILua"
 		DESTINATION "${FINAL_INSTALL_DIR}/usr/share/librecad"
 		PATTERN "CMakeLists.txt" EXCLUDE
 )
+endif()

lckernel/CMakeLists.txt

@@ -3,9 +3,13 @@ project(LCKERNEL)
 
 #TODO: Fix this
 set(PATTERN_RESOURCE_PATH ${CMAKE_SOURCE_DIR}/res/hatch)
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/res/hatch"
-		DESTINATION "${FINAL_INSTALL_DIR}/usr/share/librecad"
-)
+if (MSVC)
+install(DIRECTORY "${PATTERN_RESOURCE_PATH}"
+    DESTINATION "${FINAL_INSTALL_DIR}/res" )
+else()
+install(DIRECTORY "${PATTERN_RESOURCE_PATH}"
+    DESTINATION "${FINAL_INSTALL_DIR}/usr/share/librecad" )
+endif()
 
 #Include TinySpline
 add_definitions("-DTINYSPLINE_DOUBLE_PRECISION")

scripts/windows-install/buildLibrecadAndCreatePackage.bat

@@ -1,25 +1,30 @@
+echo on
 cd ${{ github.workspace }} 
 
 pwd
 
 cmake -S %cd% -G "Visual Studio 17 2022" ^
--B %cd%\out\build\windows-default ^
--DCMAKE_TOOLCHAIN_FILE=%cd%\conan_toolchain.cmake ^
--DCMAKE_VERBOSE_MAKEFILE=TRUE ^
+-B %cd%\build ^
+-DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake ^
+-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ^
 -DWITH_UNITTESTS=OFF ^
 -DWITH_RENDERING_UNITTESTS=OFF ^
 --install-prefix %cd%\installprefix
 
 rem -DWITH_UNITTESTS=OFF
-cd out\build\windows-default
+cd build
+dir CPack*.cmake
 
-cmake --build . --config Release
+cmake --build . --config Release --target package
 
-cd bin
+cd bin/Release
+dir
 
 WinDeployQt librecad.exe
+dir ..
+copy ..\*.lua ..\*.json .
+where makensis.exe
+dir ..\..\CPack*.cmake
 
-cd ..
-
-cpack -C RelWithDebInfo
-
+cpack --verbose -G NSIS --config ..\..\CPackConfig.cmake
+copy LibreCAD3-*.exe ..

scripts/windows-install/createConanDirAndInstallDependencies.bat

@@ -1,4 +1,5 @@
 echo "conan"
+pwd
 mkdir conan
 pushd conan
 conan profile detect --force

scripts/windows-install/installConan.bat

@@ -3,3 +3,4 @@ pip install boost
 pip install conan
 pip install mkdocs
 pip install numpy
+pip install numpy