File tree Expand file tree Collapse file tree 2 files changed +15
-6
lines changed Expand file tree Collapse file tree 2 files changed +15
-6
lines changed Original file line number Diff line number Diff line change @@ -40,13 +40,15 @@ if(OCPPI_USE_VENDOR_ALL)
40
40
41
41
endif ()
42
42
43
+ set (TL_EXPECTED_MINIMAL_VERSION 1.0.0 )
44
+
43
45
if (OCPPI_USE_VENDOR_EXPECTED )
44
46
add_subdirectory (external/expected EXCLUDE_FROM_ALL )
45
47
set_target_properties (expected PROPERTIES EXPECTED_BUILD_TESTS OFF )
46
48
else ()
47
49
CPMFindPackage (
48
50
NAME expected
49
- VERSION 1.0.0
51
+ VERSION ${TL_EXPECTED_MINIMAL_VERSION}
50
52
GITHUB_REPOSITORY TartanLlama/expected
51
53
GIT_TAG v1.1.0
52
54
GIT_SHALLOW ON
@@ -68,13 +70,15 @@ else()
68
70
EXCLUDE_FROM_ALL ON )
69
71
endif ()
70
72
73
+ set (JSON_MINIMAL_VERSION 3.11.2 )
74
+
71
75
if (OCPPI_USE_VENDOR_JSON )
72
76
set (JSON_Install ON )
73
77
add_subdirectory (external/json EXCLUDE_FROM_ALL )
74
78
else ()
75
79
CPMFindPackage (
76
80
NAME nlohmann_json
77
- VERSION 3.11.2
81
+ VERSION ${JSON_MINIMAL_VERSION}
78
82
URL "https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz"
79
83
EXCLUDE_FROM_ALL ON
80
84
OPTIONS "JSON_Install ON" )
Original file line number Diff line number Diff line change @@ -4,9 +4,14 @@ list(APPEND CMAKE_MODULE_PATH "@PACKAGE_cmakeModulesDir@")
4
4
5
5
include (CMakeFindDependencyMacro )
6
6
7
- find_dependency (Boost 1.74.0 COMPONENTS headers )
8
- find_dependency (spdlog 1.10.0 )
9
- find_dependency (tl-expected 1.0.0 )
10
- find_dependency (nlohmann_json 3.11.2 )
7
+ set (OCPPI_USE_VENDOR_EXPECTED @OCPPI_USE_VENDOR_EXPECTED@ )
8
+ if (NOT OCPPI_USE_VENDOR_EXPECTED )
9
+ find_dependency (tl-expected @TL_EXPECTED_MINIMAL_VERSION@ )
10
+ endif ()
11
+
12
+ set (OCPPI_USE_VENDOR_JSON @OCPPI_USE_VENDOR_JSON@ )
13
+ if (NOT OCPPI_USE_VENDOR_JSON )
14
+ find_dependency (nlohmann_json @JSON_MINIMAL_VERSION@ )
15
+ endif ()
11
16
12
17
include (${CMAKE_CURRENT_LIST_DIR} /ocppi.cmake )
You can’t perform that action at this time.
0 commit comments