Skip to content

Commit a879731

Browse files
authored
Merge pull request gabrielkim13#2 from tonuonu/main
I removed copy of nlohmann-json and searching it from host system
2 parents 8f4f9d0 + 90717b0 commit a879731

File tree

1,021 files changed

+87
-146972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,021 files changed

+87
-146972
lines changed

CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ project(jsonlogic VERSION 0.1 LANGUAGES CXX)
33

44
set(CMAKE_CXX_STANDARD 17)
55

6-
include_directories(
7-
lib/json/single_include/nlohmann
6+
include_directories(src)
87

9-
src
10-
)
8+
try_compile(HAVE_EXECUTION ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src/executiontest.cpp)
9+
if(NOT HAVE_EXECUTION)
10+
message(FATAL_ERROR "Compiler seems to be old, unable to compile this source")
11+
endif()
1112

1213
add_library(
1314
${PROJECT_NAME}
@@ -48,6 +49,11 @@ add_library(
4849
src/operations/string/substr.cpp
4950
)
5051

52+
find_package(nlohmann_json 3.11.1 REQUIRED)
53+
54+
target_link_libraries(${PROJECT_NAME} PRIVATE nlohmann_json::nlohmann_json)
55+
add_library(jsonlogic::jsonlogic ALIAS jsonlogic)
56+
5157
target_include_directories(
5258
${PROJECT_NAME}
5359
PUBLIC

lib/json/.clang-format

Lines changed: 0 additions & 84 deletions
This file was deleted.

lib/json/.clang-tidy

Lines changed: 0 additions & 47 deletions
This file was deleted.

lib/json/.drone.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

lib/json/.github/CODEOWNERS

Lines changed: 0 additions & 6 deletions
This file was deleted.

lib/json/.github/CONTRIBUTING.md

Lines changed: 0 additions & 71 deletions
This file was deleted.

lib/json/.github/FUNDING.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

lib/json/.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 0 additions & 57 deletions
This file was deleted.

lib/json/.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

lib/json/.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

lib/json/.github/SECURITY.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

lib/json/.github/config.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)