Skip to content

Commit

Permalink
use sparse-map conan package
Browse files Browse the repository at this point in the history
  • Loading branch information
bigerl committed Jan 31, 2020
1 parent 379152a commit 4aa096a
Show file tree
Hide file tree
Showing 23 changed files with 3 additions and 9,251 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ find_package(Threads REQUIRED)
set(hypertrie_INSTALL_INCLUDE_DIR "include" CACHE STRING "The installation include directory")
set(hypertrie_INSTALL_CMAKE_DIR "share/hypertrie/cmake" CACHE STRING "The installation cmake directory")

add_subdirectory(thirdparty/sparse-map)

#include cppitertools, see https://github.com/ryanhaining/cppitertools
add_library(cppitertools INTERFACE)
add_library(cppitertools::cppitertools ALIAS cppitertools)
Expand All @@ -38,6 +36,7 @@ target_include_directories(cppitertools INTERFACE

find_package(abseil REQUIRED)
find_package(tsl-hopscotch-map REQUIRED)
find_package(tsl-sparse-map REQUIRED)
find_package(fmt CONFIG REQUIRED)

SET(Boost_USE_STATIC_LIBS ON)
Expand All @@ -55,12 +54,12 @@ target_include_directories(hypertrie INTERFACE

target_link_libraries(hypertrie INTERFACE
cppitertools
tsl::sparse_map
abseil::abseil
tsl-hopscotch-map::tsl-hopscotch-map
fmt::fmt
Boost::boost
Threads::Threads
tsl-sparse-map::tsl-sparse-map
)

# testing
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Hypertrie(ConanFile):
license = "AGPL"
topics = "tensor", "data structure", "einsum", "einstein summation", "hypertrie"
settings = "build_type", "compiler", "os", "arch"
requires = "boost/1.71.0@conan/stable", "tsl-hopscotch-map/2.2.1@tessil/stable", "fmt/6.0.0@bincrafters/stable", "abseil/20181200@bincrafters/stable", "Catch2/2.9.1@catchorg/stable"
requires = "boost/1.71.0@conan/stable", "tsl-hopscotch-map/2.2.1@tessil/stable", "fmt/6.0.0@bincrafters/stable", "abseil/20181200@bincrafters/stable", "Catch2/2.9.1@catchorg/stable", "tsl-sparse-map/0.6.2@tessil/stable"
generators = "cmake", "cmake_find_package", "cmake_paths"
exports = "LICENSE.txt"
exports_sources = "include/*", "thirdparty/*", "CMakeLists.txt", "cmake/*"
Expand Down
1 change: 0 additions & 1 deletion thirdparty/sparse-map/.codecov.yml

This file was deleted.

57 changes: 0 additions & 57 deletions thirdparty/sparse-map/.travis.yml

This file was deleted.

78 changes: 0 additions & 78 deletions thirdparty/sparse-map/CMakeLists.txt

This file was deleted.

21 changes: 0 additions & 21 deletions thirdparty/sparse-map/LICENSE

This file was deleted.

Loading

0 comments on commit 4aa096a

Please sign in to comment.