Skip to content

Commit f57203f

Browse files
committed
updated cpm dependencies
1 parent 0abfe98 commit f57203f

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

cmake/project-application.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ endif()
2525
# Application dependencies
2626
# ==============================================================================
2727
# Note: DotNameLib target should be available from orchestrator
28-
CPMAddPackage("gh:cpm-cmake/CPMLicenses.cmake@0.0.7")
28+
CPMAddPackage("gh:tomasmark79/CPMLicenses.cmake@0.0.7")
2929
cpm_licenses_create_disclaimer_target(
3030
write-licenses-${APPLICATION_NAME}
3131
"${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}_third_party.txt" "${CPM_PACKAGES}")

cmake/project-library.cmake

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/${LIBRARY_NAME}/
3333
# Library dependencies
3434
# ==============================================================================
3535
# Try to find dependencies via find_package (Conan/system), fallback to CPM
36+
37+
CPMAddPackage("gh:tomasmark79/PackageProject.cmake@1.13.0")
3638
find_package(fmt QUIET)
3739
if(NOT fmt_FOUND)
38-
CPMAddPackage("gh:fmtlib/fmt#11.2.0")
39-
install(TARGETS fmt EXPORT ${LIBRARY_NAME}Targets)
40+
CPMAddPackage(
41+
GITHUB_REPOSITORY fmtlib/fmt
42+
GIT_TAG 12.1.0
43+
OPTIONS "FMT_INSTALL YES" "FMT_TEST NO" "FMT_DOC NO")
4044
endif()
4145

4246
find_package(nlohmann_json QUIET)
@@ -45,9 +49,7 @@ if(NOT nlohmann_json_FOUND)
4549
install(TARGETS nlohmann_json EXPORT ${LIBRARY_NAME}Targets)
4650
endif()
4751

48-
# CPM packages specific to library
49-
CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.12.0")
50-
CPMAddPackage("gh:cpm-cmake/CPMLicenses.cmake@0.0.7")
52+
CPMAddPackage("gh:tomasmark79/CPMLicenses.cmake@0.0.7")
5153
cpm_licenses_create_disclaimer_target(
5254
write-licenses-${LIBRARY_NAME} "${CMAKE_CURRENT_BINARY_DIR}/${LIBRARY_NAME}_third_party.txt"
5355
"${CPM_PACKAGES}")
@@ -113,7 +115,7 @@ packageProject(
113115
INCLUDE_DIR "/include"
114116
INCLUDE_DESTINATION "include"
115117
INCLUDE_HEADER_PATTERN "*.h;*.hpp;*.hh;*.hxx"
116-
DEPENDENCIES "fmt#11.2.0;nlohmann_json#3.12.0;CPMLicenses.cmake@0.0.7"
118+
DEPENDENCIES "fmt#12.1.0;nlohmann_json#3.12.0;CPMLicenses.cmake@0.0.7"
117119
VERSION_HEADER "${LIBRARY_NAME}/version.h"
118120
EXPORT_HEADER "${LIBRARY_NAME}/export.h"
119121
NAMESPACE ${LIBRARY_NAMESPACE}

0 commit comments

Comments
 (0)