feat: make ortools optional

Author: panzergame

.github/workflows/deploy-windows.yml

@@ -40,7 +40,7 @@ jobs:
       - name: CMake
         shell: bash
         run: |
-          cmake -B build -DBUILD_TESTING=OFF -DQt6_DIR=${Qt_ROOT}/lib/cmake/Qt6 -DCMAKE_PREFIX_PATH=../or-tools_x64_VisualStudio2022_cpp_v9.10.4067
+          cmake -B build -DBUILD_TESTING=OFF -DWITH_ORTOOLS=ON -DQt6_DIR=${Qt_ROOT}/lib/cmake/Qt6 -DCMAKE_PREFIX_PATH=../or-tools_x64_VisualStudio2022_cpp_v9.10.4067
       - name: Build
         run: cmake --build build --config Release
       - name: Deploy Qt

CMakeLists.txt

@@ -4,6 +4,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 project(dxfplotter)
 
+option(WITH_ORTOOLS OFF "Enable ortools support for path optimization")
+
 include(CTest)
 include(CPack)
 
@@ -44,7 +46,9 @@ set(TEMPLATE_DIR ${PROJECT_SOURCE_DIR}/template)
 find_package(codecov)
 
 find_package(PythonInterp REQUIRED)
-find_package(ortools CONFIG REQUIRED)
+if (WITH_ORTOOLS)
+	find_package(ortools CONFIG REQUIRED)
+endif()
 
 find_package(Qt6 COMPONENTS REQUIRED
 	Core

ci/buildappimage.sh

@@ -37,7 +37,7 @@ pushd "$BUILD_DIR"
 
 # configure build files with CMake
 # we need to explicitly set the install prefix, as CMake's default is /usr/local for some reason...
-cmake "$REPO_ROOT" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF -DQt6_DIR=/opt/qt/6.8.2/gcc_64/lib/cmake/Qt6
+cmake "$REPO_ROOT" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF -DWITH_ORTOOLS=ON -DQt6_DIR=/opt/qt/6.8.2/gcc_64/lib/cmake/Qt6
 
 # build project and install files into AppDir
 make -j$(nproc)

ci/buildsonarcloud.sh

@@ -30,7 +30,7 @@ pushd "$BUILD_DIR"
 
 # configure build files with CMake
 # we need to explicitly set the install prefix, as CMake's default is /usr/local for some reason...
-cmake "$REPO_ROOT" -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON -DQt6_DIR=/opt/qt/6.8.2/gcc_64/lib/cmake/Qt6
+cmake "$REPO_ROOT" -DCMAKE_BUILD_TYPE=Debug -DWITH_ORTOOLS=ON -DENABLE_COVERAGE=ON -DQt6_DIR=/opt/qt/6.8.2/gcc_64/lib/cmake/Qt6
 
 # Wraps the compilation with the Build Wrapper to generate configuration (used
 # later by the SonarQube Scanner) into the "bw-output" folder

src/geometry/CMakeLists.txt

@@ -8,7 +8,6 @@ set(SRC
 	circle.cpp
 	cubicspline.cpp
 	line.cpp
-	orderoptimizer.cpp
 	pocketer.cpp
 	polyline.cpp
 	quadraticspline.cpp
@@ -22,14 +21,26 @@ set(SRC
 	circle.h
 	cubicspline.h
 	line.h
-	orderoptimizer.h
 	polyline.h
 	quadraticspline.h
 	spline.h
 	rect.h
 	utils.h
 )
 
+if (WITH_ORTOOLS)
+	list(APPEND SRC
+		orderoptimizer.cpp
+
+		orderoptimizer.h
+	)
+endif()
+
 add_library(geometry ${SRC})
-target_link_libraries(geometry PUBLIC ortools::ortools)
+if (WITH_ORTOOLS)
+	target_link_libraries(geometry PUBLIC ortools::ortools)
+	target_compile_definitions(geometry PUBLIC WITH_ORTOOLS)
+endif()
+
+
 add_coverage(geometry)

src/model/task.cpp

@@ -2,7 +2,10 @@
 
 #include <iterator>
 #include <common/copy.h>
+
+#ifdef WITH_ORTOOLS
 #include <geometry/orderoptimizer.h>
+#endif
 
 namespace model
 {
@@ -198,6 +201,7 @@ void Task::showHidden()
 	});
 }
 
+#ifdef WITH_ORTOOLS
 geometry::OrderOptimizer::NodesPerGroup generateNodesSingleGroup(const Path::ListPtr &paths)
 {
 	geometry::OrderOptimizer::Node::List group(paths.size());
@@ -255,9 +259,11 @@ geometry::OrderOptimizer::NodesPerGroup generateNodesPerGroupOfLength(const Path
 
 	return nodesPerGroup;
 }
+#endif
 
 void Task::optimizeOrder(bool maintainPathLengthOrder, float lengthPrecision, float distancePrecision)
 {
+#ifdef WITH_ORTOOLS
 	const geometry::OrderOptimizer::NodesPerGroup nodesPerGroup = maintainPathLengthOrder ?
 		 generateNodesPerGroupOfLength(m_paths, lengthPrecision) :
 		 generateNodesSingleGroup(m_paths);
@@ -273,6 +279,7 @@ void Task::optimizeOrder(bool maintainPathLengthOrder, float lengthPrecision, fl
 
 	std::swap(m_stack, newPaths);
 	emit pathOrderChanged();
+#endif
 }
 
 geometry::Rect Task::selectionBoundingRect() const

test/CMakeLists.txt

@@ -22,7 +22,6 @@ set(SRC
 	exporterfixture.cpp
 	exporterrenderer.cpp
 	gcodeexporter.cpp
-	orderoptimizer.cpp
 	path.cpp
 	pathsettings.cpp
 	pocketer.cpp
@@ -37,6 +36,12 @@ set(SRC
 	polylineutils.h
 )
 
+if (WITH_ORTOOLS)
+	list(APPEND SRC
+		orderoptimizer.cpp
+	)
+endif()
+
 add_executable(dxfplotter-test ${SRC} main.cpp)
 
 target_include_directories(dxfplotter-test PRIVATE ${Qt5Test_INCLUDE_DIRS})