Skip to content
This repository was archived by the owner on Dec 19, 2025. It is now read-only.

Commit f140d97

Browse files
authored
Merge pull request #46 from sbromberger/sbromberger/testdf
Sbromberger/testdf
2 parents 7695ac5 + e7da8e1 commit f140d97

15 files changed

Lines changed: 3462 additions & 3393 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ __pycache__
1111
testbracket
1212
testmvmap
1313
testdf
14-
testgraph
14+
test/TestGraph/testgraph
15+
test/include/wheredev
16+
a.out

CMakeLists.txt

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,26 @@ endif()
7272

7373
#
7474
# Boost
75-
include(setup_boost)
76-
prepare_fetchcontent_boost()
77-
set(FETCHCONTENT_QUIET FALSE)
75+
set(BOOST_URL
76+
"https://github.com/boostorg/boost/releases/download/boost-1.87.0/boost-1.87.0-cmake.tar.gz"
77+
CACHE STRING "URL to fetch Boost tarball")
78+
79+
#
80+
# Boost
7881
FetchContent_Declare(
79-
Boost
80-
GIT_REPOSITORY https://github.com/boostorg/boost.git
81-
GIT_TAG boost-1.83.0
82-
GIT_SUBMODULES ${BOOST_REQD_SUBMODULES}
83-
GIT_PROGRESS TRUE
84-
CONFIGURE_COMMAND "" # tell CMake it's not a cmake project
82+
Boost
83+
URL ${BOOST_URL}
8584
)
85+
set(BOOST_INCLUDE_LIBRARIES json)
8686
FetchContent_MakeAvailable(Boost)
87-
get_boost_include_dirs()
8887

88+
#
89+
# JSONLogic
90+
FetchContent_Declare(jsonlogic
91+
GIT_REPOSITORY https://github.com/LLNL/jsonlogic.git
92+
GIT_TAG master
93+
)
94+
FetchContent_MakeAvailable(jsonlogic)
8995

9096
### Require out-of-source builds
9197
file(TO_CMAKE_PATH "${PROJECT_BINARY_DIR}/CMakeLists.txt" LOC_PATH)

0 commit comments

Comments
 (0)