j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add comments

Browse source
This commit is contained in:
Hubert Chathi 2020-04-17 15:44:12 -04:00
parent cade804c1a
commit 2b0e4c7a94
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -89,6 +89,9 @@ endif()
## install header files, generate and install cmake config files for find_package() ## install header files, generate and install cmake config files for find_package()
## ##
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
# use a custom package version config file instead of
# write_basic_package_version_file to ensure that it's architecture-independent
# 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} ${NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE}

4
cmake/nlohmann_jsonConfigVersion.cmake.in
View file

@ -1,3 +1,7 @@
# This is essentially cmake's BasicConfigVersion-SameMajorVersion.cmake.in but
# without the 32/64-bit check. Since json is a header-only library, it doesn't
# matter if it was built on a different platform than what it is used on (see
# https://github.com/nlohmann/json/issues/1697).
set(PACKAGE_VERSION "@PROJECT_VERSION@") set(PACKAGE_VERSION "@PROJECT_VERSION@")
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)