From daa279d57b20736ba3bf39de935fa919661d8ecf Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sat, 11 Apr 2020 18:11:52 +0200 Subject: [PATCH] CMake: made project arch-independent --- CHANGELOG.md | 1 + src/CMakeLists.txt | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28eac903..2048a8b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ HEAD ---- * CMake: don't build tests when imported in another project +* CMake: made project arch-independent v6.15.1 (2020-04-08) ------- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e53a4b2a..de0032ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,12 +37,18 @@ install( ) include(CMakePackageConfigHelpers) + +if(${CMAKE_VERSION} VERSION_GREATER "3.14.0") + set(ARCH_INDEPENDENT "ARCH_INDEPENDENT") +endif() + write_basic_package_version_file( "${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake" VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion + ${ARCH_INDEPENDENT} ) configure_package_config_file(