Skip to content

Commit 2f25341

Browse files
committed
chore: improve config file
Signed-off-by: ComixHe <[email protected]>
1 parent 48a416c commit 2f25341

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ if(OCPPI_USE_VENDOR_ALL)
4040

4141
endif()
4242

43+
set(TL_EXPECTED_MINIMAL_VERSION 1.0.0)
44+
4345
if(OCPPI_USE_VENDOR_EXPECTED)
4446
add_subdirectory(external/expected EXCLUDE_FROM_ALL)
4547
set_target_properties(expected PROPERTIES EXPECTED_BUILD_TESTS OFF)
4648
else()
4749
CPMFindPackage(
4850
NAME expected
49-
VERSION 1.0.0
51+
VERSION ${TL_EXPECTED_MINIMAL_VERSION}
5052
GITHUB_REPOSITORY TartanLlama/expected
5153
GIT_TAG v1.1.0
5254
GIT_SHALLOW ON
@@ -68,13 +70,15 @@ else()
6870
EXCLUDE_FROM_ALL ON)
6971
endif()
7072

73+
set(JSON_MINIMAL_VERSION 3.11.2)
74+
7175
if(OCPPI_USE_VENDOR_JSON)
7276
set(JSON_Install ON)
7377
add_subdirectory(external/json EXCLUDE_FROM_ALL)
7478
else()
7579
CPMFindPackage(
7680
NAME nlohmann_json
77-
VERSION 3.11.2
81+
VERSION ${JSON_MINIMAL_VERSION}
7882
URL "https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz"
7983
EXCLUDE_FROM_ALL ON
8084
OPTIONS "JSON_Install ON")

misc/cmake/ocppi-config.cmake.in

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@ list(APPEND CMAKE_MODULE_PATH "@PACKAGE_cmakeModulesDir@")
44

55
include(CMakeFindDependencyMacro)
66

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()
1116

1217
include(${CMAKE_CURRENT_LIST_DIR}/ocppi.cmake)

0 commit comments

Comments
 (0)