Skip to content

Restore libigl as DAG builder dependency and enable Boost Asio #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adam-ce merged 3 commits into from
Oct 31, 2026
Merged

Restore libigl as DAG builder dependency and enable Boost Asio #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2edfd14
Restore libigl as a DAG builder dependency
adam-ce Oct 31, 2026
1efe45b
Enable Boost Asio and Beast for tile-server
adam-ce Oct 30, 2026
a5de80f
Allow short if statements without else on one line
adam-ce Oct 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: Never
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
Expand Down
5 changes: 4 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/dag_builder/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down