wip

Author: panzergame

.github/workflows/deploy-windows.yml

@@ -4,46 +4,50 @@ on:
     # Sequence of patterns matched against refs/tags
     tags:
      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+    branches:
+      - "**"
+      
+env:
+  Qt_ROOT: ../Qt/6.8.2/msvc2022_64/
 
 jobs:
   build:
     runs-on: windows-latest
     steps:
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v1  # not v2!
+        uses: actions/cache@v4
         with:
           path: ../Qt
-          key: ${{ runner.os }}-QtCache
-      
+          key: ${{ runner.os }}-QtCache      
+      - name: Install python packages
+        shell: bash
+        run: python -m pip install jinja2 aqtinstall
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
-        with:
-          cached: ${{ steps.cache-qt.outputs.cache-hit }}
-      - uses: lukka/get-cmake@latest
-      - name: Add msbuild to PATH
-        uses: microsoft/[email protected]
-      - name: Install jinja2
         shell: bash
-        run: python -m pip install jinja2
+        run: aqt install-qt -O ../Qt windows desktop 6.8.2 win64_msvc2022_64 -m qt3d qtshadertools
       - name: Install zip
         shell: bash
         run: choco install -y zip
+      - name: Install ortools
+        shell: bash
+        run: | 
+          C:/msys64/usr/bin/wget.exe https://github.com/google/or-tools/releases/download/v9.10/or-tools_x64_VisualStudio2022_cpp_v9.10.4067.zip
+          unzip or-tools_x64_VisualStudio2022_cpp_v9.10.4067.zip -d ../
       - name: Checkout
         uses: actions/checkout@v2
         with:
           submodules: true
+          fetch-depth: 0
       - name: CMake
         shell: bash
         run: |
-          mkdir build
-          cd build
-          cmake -DBUILD_TESTING=OFF ..
+          cmake -B build -DBUILD_TESTING=OFF -DQt6_DIR=${Qt_ROOT}/lib/cmake/Qt6 -DCMAKE_PREFIX_PATH=../or-tools_x64_VisualStudio2022_cpp_v9.10.4067
       - name: Build
-        run: msbuild build\dxfplotter.sln /property:Configuration=Release
+        run: cmake --build build --config Release
       - name: Deploy Qt
         shell: bash
-        run: ci/deploywindows.sh
+        run: PATH=$PATH:${Qt_ROOT}/bin ci/deploywindows.sh
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:

CMakeLists.txt

@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.15)
+set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 project(dxfplotter)
 
@@ -15,7 +17,6 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC OFF)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 set(BUILD_TESTS OFF)
 set(BUILD_SAMPLES OFF)
@@ -26,7 +27,7 @@ set(BUILD_FLATZINC OFF)
 set(USE_HIGHS OFF)
 set(JUST_INSTALL_CEREAL ON)
 
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
 
 # Compilation flag with all warnings.
 if(MSVC)
@@ -35,7 +36,7 @@ else()
 	add_compile_options(-fPIC -Wall -Wextra -DNDEBUG)
 endif()
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(TEMPLATE_DIR ${PROJECT_SOURCE_DIR}/template)
@@ -56,6 +57,8 @@ find_package(Qt6 COMPONENTS REQUIRED
 
 qt_standard_project_setup()
 
+add_definitions(${Qt6Core_DEFINITIONS})
+
 set(INCLUDE_DIRS
 	src
 	thirdparty
@@ -64,7 +67,6 @@ set(INCLUDE_DIRS
 	thirdparty/fmt/include
 	thirdparty/nanoflann/include
 	thirdparty/units/include
-	thirdparty/yaml-cpp/include
 	thirdparty/or-tools
 	template
 	${CMAKE_BINARY_DIR}/src
@@ -99,7 +101,6 @@ set(LINK_LIBRARIES
 	Qt6::Svg
 	Qt6::3DCore
 	Qt6::3DExtras
-	yaml-cpp
 )
 
 include_directories(${INCLUDE_DIRS})

src/config/CMakeLists.txt

@@ -13,6 +13,7 @@ set(SRC
 
 add_library(config ${SRC})
 add_dependencies(config generate-config)
+target_link_libraries(config PUBLIC yaml-cpp::yaml-cpp)
 
 add_custom_command(
 	OUTPUT config.h

src/exporter/dxfplot/CMakeLists.txt

@@ -5,5 +5,5 @@ set(SRC
 )
 
 add_library(exporter-dxfplot ${SRC})
-add_dependencies(exporter-dxfplot generate-config)
+target_link_libraries(exporter-dxfplot PRIVATE config)
 add_coverage(exporter-dxfplot)

src/exporter/gcode/CMakeLists.txt

@@ -9,5 +9,5 @@ set(SRC
 )
 
 add_library(exporter-gcode ${SRC})
-add_dependencies(exporter-gcode generate-config)
+target_link_libraries(exporter-gcode PRIVATE config)
 add_coverage(exporter-gcode)

src/exporter/renderer/CMakeLists.txt

@@ -7,5 +7,5 @@ set(SRC
 )
 
 add_library(exporter-renderer ${SRC})
-add_dependencies(exporter-renderer generate-config)
+target_link_libraries(exporter-renderer PRIVATE config)
 add_coverage(exporter-renderer)

src/importer/dxfplot/CMakeLists.txt

@@ -5,4 +5,4 @@ set(SRC
 )
 
 add_library(importer-dxfplot ${SRC})
-add_dependencies(importer-dxfplot generate-config)
+target_link_libraries(importer-dxfplot PRIVATE config)

src/model/CMakeLists.txt

@@ -26,6 +26,5 @@ set(SRC
 )
 
 add_library(model ${SRC})
-add_dependencies(model generate-config)
-target_link_libraries(model PUBLIC geometry)
+target_link_libraries(model PUBLIC geometry PRIVATE config)
 add_coverage(model)

src/view/CMakeLists.txt

@@ -14,5 +14,6 @@ set(SRC
 )
 
 add_library(view ${SRC})
-add_dependencies(view generate-config uic)
+target_link_libraries(view PRIVATE config)
+add_dependencies(view uic)
 

src/view/dialogs/settings/CMakeLists.txt

@@ -11,4 +11,5 @@ set(SRC
 )
 
 add_library(view-dialogs-settings ${SRC})
-add_dependencies(view-dialogs-settings generate-config uic-dialogs-settings)
+target_link_libraries(view-dialogs-settings PRIVATE config)
+add_dependencies(view-dialogs-settings uic-dialogs-settings)