Skip to content

Commit

Permalink
Remove robin_hood from CMake install
Browse files Browse the repository at this point in the history
  • Loading branch information
Auburn committed Sep 25, 2021
1 parent 2c7881d commit 702fabe
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions NoiseTool/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ CPMAddPackage(
NAME imgui
GITHUB_REPOSITORY ocornut/imgui
GIT_TAG 7bfc379a23e97b6777eb80aafb50a8e6248904cd
EXCLUDE_FROM_ALL YES
)
# Set dir for find_package(ImGui)
set(IMGUI_DIR ${imgui_SOURCE_DIR})
Expand All @@ -62,12 +63,14 @@ CPMAddPackage(
NAME imnodes
GITHUB_REPOSITORY Auburn/imnodes
GIT_TAG a295b4af69045645d657363d5d135e2d8a3785f6
EXCLUDE_FROM_ALL YES
)

CPMAddPackage(
NAME robinhoodhashing
GITHUB_REPOSITORY martinus/robin-hood-hashing
GIT_TAG 3.11.3
GIT_TAG 3.11.3
EXCLUDE_FROM_ALL YES
)

# Use modules from magnum-integration since it has everything we need
Expand Down Expand Up @@ -100,10 +103,9 @@ add_executable(NoiseTool
${NoiseTool_RESOURCES}
)

# Include imnodes & rhh in NoiseTool project since setting up separate cmake library with imgui dependancy was causing issues
# Include imnodes in NoiseTool project since setting up separate cmake library with imgui dependancy was causing issues
target_include_directories(NoiseTool PRIVATE
"${imnodes_SOURCE_DIR}"
"${robinhoodhashing_SOURCE_DIR}/src/include")
"${imnodes_SOURCE_DIR}")

target_link_libraries(NoiseTool PRIVATE
FastNoise
Expand All @@ -112,6 +114,7 @@ target_link_libraries(NoiseTool PRIVATE
Magnum::SceneGraph
MagnumIntegration::ImGui
ImGui::SourcesMiscCpp
robin_hood
)

# Windows HiDPI support
Expand Down

0 comments on commit 702fabe

Please sign in to comment.