github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

CMake: made project arch-independent

Browse Source
This commit is contained in:
Benoit Blanchon
2020-04-11 18:11:52 +02:00
parent ae9b7926a2
commit daa279d57b
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@ HEAD
---- ----
* CMake: don't build tests when imported in another project * CMake: don't build tests when imported in another project
* CMake: made project arch-independent
v6.15.1 (2020-04-08) v6.15.1 (2020-04-08)
------- -------

6
src/CMakeLists.txt
View File

@@ -37,12 +37,18 @@ install(
) )
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
if(${CMAKE_VERSION} VERSION_GREATER "3.14.0")
set(ARCH_INDEPENDENT "ARCH_INDEPENDENT")
endif()
write_basic_package_version_file( write_basic_package_version_file(
"${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake" "${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake"
VERSION VERSION
${PROJECT_VERSION} ${PROJECT_VERSION}
COMPATIBILITY COMPATIBILITY
SameMajorVersion SameMajorVersion
${ARCH_INDEPENDENT}
) )
configure_package_config_file( configure_package_config_file(