External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shorten NLOHMANN_JSON_* variables to JSON_*

Browse Source
This commit is contained in:
Florian Albrechtskirchinger 2022-09-23 09:23:08 +02:00
parent 61684f8fb7
commit d14e22c40b
No known key found for this signature in database
GPG Key ID: 19618CE9B2D4BE6D
6 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@ -32,16 +32,16 @@ include(json_opts)
# add library targets # add library targets
############################################################################# #############################################################################
add_library(${NLOHMANN_JSON_TARGET_NAME} INTERFACE) add_library(${JSON_TARGET_NAME} INTERFACE)
add_library(${PROJECT_NAME}::${NLOHMANN_JSON_TARGET_NAME} ALIAS ${NLOHMANN_JSON_TARGET_NAME}) add_library(${PROJECT_NAME}::${JSON_TARGET_NAME} ALIAS ${JSON_TARGET_NAME})
if (${CMAKE_VERSION} VERSION_LESS "3.8.0") if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
target_compile_features(${NLOHMANN_JSON_TARGET_NAME} INTERFACE cxx_range_for) target_compile_features(${JSON_TARGET_NAME} INTERFACE cxx_range_for)
else() else()
target_compile_features(${NLOHMANN_JSON_TARGET_NAME} INTERFACE cxx_std_11) target_compile_features(${JSON_TARGET_NAME} INTERFACE cxx_std_11)
endif() endif()
target_compile_definitions( target_compile_definitions(
${NLOHMANN_JSON_TARGET_NAME} ${JSON_TARGET_NAME}
INTERFACE INTERFACE
$<$<NOT:$<BOOL:${JSON_GlobalUDLs}>>:JSON_USE_GLOBAL_UDLS=0> $<$<NOT:$<BOOL:${JSON_GlobalUDLs}>>:JSON_USE_GLOBAL_UDLS=0>
$<$<NOT:$<BOOL:${JSON_ImplicitConversions}>>:JSON_USE_IMPLICIT_CONVERSIONS=0> $<$<NOT:$<BOOL:${JSON_ImplicitConversions}>>:JSON_USE_IMPLICIT_CONVERSIONS=0>
@ -51,9 +51,9 @@ target_compile_definitions(
) )
target_include_directories( target_include_directories(
${NLOHMANN_JSON_TARGET_NAME} ${JSON_TARGET_NAME}
${NLOHMANN_JSON_SYSTEM_INCLUDE} INTERFACE ${JSON_SYSTEM_INCLUDE} INTERFACE
$<BUILD_INTERFACE:${NLOHMANN_JSON_INCLUDE_BUILD_DIR}> $<BUILD_INTERFACE:${JSON_INCLUDE_BUILD_DIR}>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
@ -62,7 +62,7 @@ if (MSVC)
set(NLOHMANN_ADD_NATVIS TRUE) set(NLOHMANN_ADD_NATVIS TRUE)
set(NLOHMANN_NATVIS_FILE "nlohmann_json.natvis") set(NLOHMANN_NATVIS_FILE "nlohmann_json.natvis")
target_sources( target_sources(
${NLOHMANN_JSON_TARGET_NAME} ${JSON_TARGET_NAME}
INTERFACE INTERFACE
$<INSTALL_INTERFACE:${NLOHMANN_NATVIS_FILE}> $<INSTALL_INTERFACE:${NLOHMANN_NATVIS_FILE}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${NLOHMANN_NATVIS_FILE}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${NLOHMANN_NATVIS_FILE}>
@ -100,23 +100,23 @@ include(CMakePackageConfigHelpers)
# https://github.com/nlohmann/json/issues/1697 # https://github.com/nlohmann/json/issues/1697
configure_file( configure_file(
"cmake/nlohmann_jsonConfigVersion.cmake.in" "cmake/nlohmann_jsonConfigVersion.cmake.in"
${NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE} ${JSON_CMAKE_VERSION_CONFIG_FILE}
@ONLY @ONLY
) )
configure_file( configure_file(
${NLOHMANN_JSON_CMAKE_CONFIG_TEMPLATE} ${JSON_CMAKE_CONFIG_TEMPLATE}
${NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE} ${JSON_CMAKE_PROJECT_CONFIG_FILE}
@ONLY @ONLY
) )
if(JSON_Install) if(JSON_Install)
install( install(
DIRECTORY ${NLOHMANN_JSON_INCLUDE_BUILD_DIR} DIRECTORY ${JSON_INCLUDE_BUILD_DIR}
DESTINATION ${NLOHMANN_JSON_INCLUDE_INSTALL_DIR} DESTINATION ${JSON_INCLUDE_INSTALL_DIR}
) )
install( install(
FILES ${NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE} ${NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE} FILES ${JSON_CMAKE_PROJECT_CONFIG_FILE} ${JSON_CMAKE_VERSION_CONFIG_FILE}
DESTINATION ${NLOHMANN_JSON_CONFIG_INSTALL_DIR} DESTINATION ${JSON_CONFIG_INSTALL_DIR}
) )
if (NLOHMANN_ADD_NATVIS) if (NLOHMANN_ADD_NATVIS)
install( install(
@ -125,23 +125,23 @@ if(JSON_Install)
) )
endif() endif()
export( export(
TARGETS ${NLOHMANN_JSON_TARGET_NAME} TARGETS ${JSON_TARGET_NAME}
NAMESPACE ${PROJECT_NAME}:: NAMESPACE ${PROJECT_NAME}::
FILE ${NLOHMANN_JSON_CMAKE_PROJECT_TARGETS_FILE} FILE ${JSON_CMAKE_PROJECT_TARGETS_FILE}
) )
install( install(
TARGETS ${NLOHMANN_JSON_TARGET_NAME} TARGETS ${JSON_TARGET_NAME}
EXPORT ${NLOHMANN_JSON_TARGETS_EXPORT_NAME} EXPORT ${JSON_TARGETS_EXPORT_NAME}
INCLUDES DESTINATION ${NLOHMANN_JSON_INCLUDE_INSTALL_DIR} INCLUDES DESTINATION ${JSON_INCLUDE_INSTALL_DIR}
) )
install( install(
EXPORT ${NLOHMANN_JSON_TARGETS_EXPORT_NAME} EXPORT ${JSON_TARGETS_EXPORT_NAME}
NAMESPACE ${PROJECT_NAME}:: NAMESPACE ${PROJECT_NAME}::
DESTINATION ${NLOHMANN_JSON_CONFIG_INSTALL_DIR} DESTINATION ${JSON_CONFIG_INSTALL_DIR}
) )
install( install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
DESTINATION ${NLOHMANN_JSON_PKGCONFIG_INSTALL_DIR} DESTINATION ${JSON_PKGCONFIG_INSTALL_DIR}
) )
endif() endif()

26
cmake/json_opts.cmake
View File

@ -43,25 +43,25 @@ option(JSON_SystemInclude "Include as system headers (skip for clang-tidy)." OFF
# configuration # configuration
############################################################################# #############################################################################
set(NLOHMANN_JSON_TARGET_NAME ${PROJECT_NAME}) set(JSON_TARGET_NAME ${PROJECT_NAME})
set(NLOHMANN_JSON_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE INTERNAL "") set(JSON_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE INTERNAL "")
set(NLOHMANN_JSON_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}") set(JSON_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
set(NLOHMANN_JSON_TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") set(JSON_TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
set(NLOHMANN_JSON_CMAKE_CONFIG_TEMPLATE "cmake/nlohmann_jsonConfig.cmake.in") set(JSON_CMAKE_CONFIG_TEMPLATE "cmake/nlohmann_jsonConfig.cmake.in")
set(NLOHMANN_JSON_CMAKE_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}") set(JSON_CMAKE_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}")
set(NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}ConfigVersion.cmake") set(JSON_CMAKE_VERSION_CONFIG_FILE "${JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
set(NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}Config.cmake") set(JSON_CMAKE_PROJECT_CONFIG_FILE "${JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}Config.cmake")
set(NLOHMANN_JSON_CMAKE_PROJECT_TARGETS_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}Targets.cmake") set(JSON_CMAKE_PROJECT_TARGETS_FILE "${JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}Targets.cmake")
set(NLOHMANN_JSON_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/pkgconfig") set(JSON_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/pkgconfig")
if (JSON_MultipleHeaders) if (JSON_MultipleHeaders)
set(NLOHMANN_JSON_INCLUDE_BUILD_DIR "${PROJECT_SOURCE_DIR}/include/") set(JSON_INCLUDE_BUILD_DIR "${PROJECT_SOURCE_DIR}/include/")
else() else()
set(NLOHMANN_JSON_INCLUDE_BUILD_DIR "${PROJECT_SOURCE_DIR}/single_include/") set(JSON_INCLUDE_BUILD_DIR "${PROJECT_SOURCE_DIR}/single_include/")
endif() endif()
if (JSON_SystemInclude) if (JSON_SystemInclude)
set(NLOHMANN_JSON_SYSTEM_INCLUDE "SYSTEM") set(JSON_SYSTEM_INCLUDE "SYSTEM")
endif() endif()
set(JSON_TEST_DATA_URL https://github.com/nlohmann/json_test_data.git) set(JSON_TEST_DATA_URL https://github.com/nlohmann/json_test_data.git)

2
cmake/json_summary.cmake
View File

@ -88,5 +88,5 @@ json_feature(JSON_LegacyDiscardedValueComparison "Legacy discarded value compari
message("") message("")
json_feature(JSON_MultipleHeaders "Use the multi-header code?") json_feature(JSON_MultipleHeaders "Use the multi-header code?")
message(" Include directory: ${NLOHMANN_JSON_INCLUDE_BUILD_DIR}") message(" Include directory: ${JSON_INCLUDE_BUILD_DIR}")
json_feature(JSON_SystemInclude "Include as system headers?") json_feature(JSON_SystemInclude "Include as system headers?")

12
cmake/nlohmann_jsonConfig.cmake.in
View File

@ -2,14 +2,14 @@ include(FindPackageHandleStandardArgs)
set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG ${CMAKE_CURRENT_LIST_FILE}) set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG ${CMAKE_CURRENT_LIST_FILE})
find_package_handle_standard_args(@PROJECT_NAME@ CONFIG_MODE) find_package_handle_standard_args(@PROJECT_NAME@ CONFIG_MODE)
if(NOT TARGET @PROJECT_NAME@::@NLOHMANN_JSON_TARGET_NAME@) if(NOT TARGET @PROJECT_NAME@::@JSON_TARGET_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@NLOHMANN_JSON_TARGETS_EXPORT_NAME@.cmake") include("${CMAKE_CURRENT_LIST_DIR}/@JSON_TARGETS_EXPORT_NAME@.cmake")
if((NOT TARGET @NLOHMANN_JSON_TARGET_NAME@) AND if((NOT TARGET @JSON_TARGET_NAME@) AND
(NOT @PROJECT_NAME@_FIND_VERSION OR (NOT @PROJECT_NAME@_FIND_VERSION OR
@PROJECT_NAME@_FIND_VERSION VERSION_LESS 3.2.0)) @PROJECT_NAME@_FIND_VERSION VERSION_LESS 3.2.0))
add_library(@NLOHMANN_JSON_TARGET_NAME@ INTERFACE IMPORTED) add_library(@JSON_TARGET_NAME@ INTERFACE IMPORTED)
set_target_properties(@NLOHMANN_JSON_TARGET_NAME@ PROPERTIES set_target_properties(@JSON_TARGET_NAME@ PROPERTIES
INTERFACE_LINK_LIBRARIES @PROJECT_NAME@::@NLOHMANN_JSON_TARGET_NAME@ INTERFACE_LINK_LIBRARIES @PROJECT_NAME@::@JSON_TARGET_NAME@
) )
endif() endif()
endif() endif()

2
tests/CMakeLists.txt
View File

@ -54,7 +54,7 @@ target_include_directories(test_main PUBLIC
thirdparty/doctest thirdparty/doctest
thirdparty/fifo_map thirdparty/fifo_map
${PROJECT_BINARY_DIR}/include) ${PROJECT_BINARY_DIR}/include)
target_link_libraries(test_main PUBLIC ${NLOHMANN_JSON_TARGET_NAME}) target_link_libraries(test_main PUBLIC ${JSON_TARGET_NAME})
############################################################################# #############################################################################
# define test- and standard-specific build settings # define test- and standard-specific build settings

2
tests/abi/CMakeLists.txt
View File

@ -18,7 +18,7 @@ target_compile_options(abi_compat_common INTERFACE
target_include_directories(abi_compat_common SYSTEM INTERFACE target_include_directories(abi_compat_common SYSTEM INTERFACE
../thirdparty/doctest ../thirdparty/doctest
include) include)
target_link_libraries(abi_compat_common INTERFACE ${NLOHMANN_JSON_TARGET_NAME}) target_link_libraries(abi_compat_common INTERFACE ${JSON_TARGET_NAME})
# shared main() # shared main()
add_library(abi_compat_main STATIC main.cpp) add_library(abi_compat_main STATIC main.cpp)