From 2edfd143360fe66905498a0645540afa71aa46fd Mon Sep 17 00:00:00 2001
From: adam-ce <5292991+adam-ce@users.noreply.github.com>
Date: Sat, 31 Oct 2026 11:23:41 +0100
Subject: [PATCH 1/3] Restore libigl as a DAG builder dependency

Fetch libigl only when a DAG target is enabled and link igl::core directly to dagbuilderlib. Reuse the existing Eigen3::Eigen target to avoid a second Eigen download.
---
 src/CMakeLists.txt             | 3 +++
 src/dag_builder/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f4221f62..1378148c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -148,6 +148,9 @@ add_library(xatlas STATIC ${xatlas_SOURCE_DIR}/source/xatlas/xatlas.cpp)
 target_include_directories(xatlas SYSTEM PUBLIC ${xatlas_SOURCE_DIR}/source)
 
 if(ALP_BUILD_DAG_BUILDER OR ALP_BUILD_DAG_CONVERT_DEBUG)
+    # Reuse the Eigen3::Eigen target above instead of libigl's Eigen download.
+    alp_add_git_repository(libigl URL https://github.com/libigl/libigl.git COMMITISH v2.6.0)
+
     alp_add_git_repository(rectpack2D URL https://github.com/TeamHypersomnia/rectpack2D.git COMMITISH bbc9d0ec05b9b508f6c781667fec718bf9e78d21)
 
     set(METIS_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
diff --git a/src/dag_builder/CMakeLists.txt b/src/dag_builder/CMakeLists.txt
index f98259bc..28b082e0 100644
--- a/src/dag_builder/CMakeLists.txt
+++ b/src/dag_builder/CMakeLists.txt
@@ -67,7 +67,7 @@ add_library(dagbuilderlib
 )
 
 target_include_directories(dagbuilderlib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(dagbuilderlib PUBLIC terrainlib libassert::assert metis rectpack2D meshoptimizer)
+target_link_libraries(dagbuilderlib PUBLIC terrainlib libassert::assert metis rectpack2D meshoptimizer igl::core)
 
 if(ALP_BUILD_DAG_BUILDER)
     add_executable(dag-builder

From 1efe45b4d2de1f099c645bc8b48b2265aa6c2d3c Mon Sep 17 00:00:00 2001
From: adam-ce <5292991+adam-ce@users.noreply.github.com>
Date: Fri, 30 Oct 2026 19:11:53 +0100
Subject: [PATCH 2/3] Enable Boost Asio and Beast for tile-server

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1378148c..f9abcd5f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ alp_setup_cmake_project(boost
     CMAKE_ARGUMENTS
         -DBOOST_ENABLE_PYTHON=OFF
         -DBUILD_TESTING=OFF
-        "-DBOOST_INCLUDE_LIBRARIES=graph\;multiprecision\;heap\;format\;logic")
+        "-DBOOST_INCLUDE_LIBRARIES=graph\;multiprecision\;heap\;format\;logic\;asio\;beast")
 find_package(Boost CONFIG REQUIRED)
 
 alp_setup_cmake_project(tbb

From a5de80f1a9e4b5289eec6b6057ff0aa2822db704 Mon Sep 17 00:00:00 2001
From: adam-ce <5292991+adam-ce@users.noreply.github.com>
Date: Sat, 31 Oct 2026 13:32:01 +0100
Subject: [PATCH 3/3] Allow short if statements without else on one line

---
 .clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index 51fc0aa5..0e44f49b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -18,7 +18,7 @@ AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
 AllowShortLambdasOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Never
+AllowShortIfStatementsOnASingleLine: WithoutElse
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None