Skip to content

Refactor: Replace vendored unordered_dense with CMake FetchContent dep #1992

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

Open
thbeu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor: Replace vendored unordered_dense with CMake FetchContent dep #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ FetchContent_Declare(stduuid GIT_REPOSITORY "https://github.com/mariusbancila/st
FetchContent_MakeAvailable(stduuid)
FetchContent_GetProperties(stduuid)

Message("Downloading unordered_dense")
FetchContent_Declare(unordered_dense GIT_REPOSITORY "https://github.com/martinus/unordered_dense" GIT_TAG "3234af2c03549bc85656bfd3a86993bf1cd8aef1" SOURCE_SUBDIR "../")
FetchContent_MakeAvailable(unordered_dense)
FetchContent_GetProperties(unordered_dense)

Message("Downloads Finished")

Expand All @@ -77,6 +81,7 @@ function(PARAM_SETTER THE_EXECUTABLE)
target_include_directories(${THE_EXECUTABLE} PUBLIC $<BUILD_INTERFACE:${earcut_SOURCE_DIR}/include>)
target_include_directories(${THE_EXECUTABLE} PUBLIC $<BUILD_INTERFACE:${spdlog_SOURCE_DIR}/include>)
target_include_directories(${THE_EXECUTABLE} PUBLIC $<BUILD_INTERFACE:${stduuid_SOURCE_DIR}/include>)
target_include_directories(${THE_EXECUTABLE} PUBLIC $<BUILD_INTERFACE:${unordered_dense_SOURCE_DIR}/include>)

if(NOT MSVC)
target_compile_options(${THE_EXECUTABLE} PUBLIC "-Wall")
Expand Down Expand Up @@ -192,6 +197,9 @@ if(NOT EMSCRIPTEN)
install(DIRECTORY ${stduuid_SOURCE_DIR}/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
install(DIRECTORY ${unordered_dense_SOURCE_DIR}/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)

# Export targets with namespace
install(EXPORT web-ifc-targets
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/web-ifc/cache/IfcCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "../parsing/IfcLoader.h"
#include "../geometry/representation/IfcCurve.h"
#include "../util/unordered_dense.h"
#include <ankerl/unordered_dense.h>

namespace webifc::cache
{
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/web-ifc/parsing/IfcLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "IfcTokenStream.h"
#include "../schema/IfcSchemaManager.h"
#include "../util/unordered_dense.h"
#include <ankerl/unordered_dense.h>

namespace webifc::parsing
{
Expand Down
18 changes: 0 additions & 18 deletions src/cpp/web-ifc/util/stl.h
View file
Open in desktop

This file was deleted.

Loading