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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f4221f62..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 @@ -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