From 3acbf2eb28ec7ad7775f6b7b09f79f1ba7fbcad9 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mar 05 2022 14:55:18 +0000 Subject: Export CMake targets as architecture independent. --- diff --git a/fast_float-fixed-cmake-architectures.patch b/fast_float-fixed-cmake-architectures.patch new file mode 100644 index 0000000..6c6588e --- /dev/null +++ b/fast_float-fixed-cmake-architectures.patch @@ -0,0 +1,27 @@ +From 1d277f02e9e955a64edc35af4d7a002c80a721c8 Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Sat, 5 Mar 2022 15:49:54 +0100 +Subject: [PATCH] Export targets as architecture independent. + +Signed-off-by: Vitaly Zaitsev +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c8f502..f3ab1be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,11 @@ set(FASTFLOAT_VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/module/FastFloatConfig + set(FASTFLOAT_PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/module/FastFloatConfig.cmake") + set(FASTFLOAT_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/FastFloat") + +-write_basic_package_version_file("${FASTFLOAT_VERSION_CONFIG}" VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion) ++if(${CMAKE_VERSION} VERSION_LESS "3.14") ++ write_basic_package_version_file("${FASTFLOAT_VERSION_CONFIG}" VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion) ++else() ++ write_basic_package_version_file("${FASTFLOAT_VERSION_CONFIG}" VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT) ++endif() + configure_package_config_file("cmake/config.cmake.in" + "${FASTFLOAT_PROJECT_CONFIG}" + INSTALL_DESTINATION "${FASTFLOAT_CONFIG_INSTALL_DIR}") diff --git a/fast_float.spec b/fast_float.spec index f4211e5..19dd196 100644 --- a/fast_float.spec +++ b/fast_float.spec @@ -31,6 +31,8 @@ Source1: %{stf_forgeurl}/archive/%{stf_commit}/supplemental_test_files-%{ # https://github.com/fastfloat/fast_float/pull/127 Patch100: %{name}-fixed-cmake-installation.patch +# https://github.com/fastfloat/fast_float/pull/129 +Patch101: %{name}-fixed-cmake-architectures.patch BuildRequires: gcc-c++ BuildRequires: cmake