From 51d1efce34a73897d57a07e051aabd061b6e58ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iy=C3=A1n=20M=C3=A9ndez=20Veiga?= Date: Thu, 9 Jan 2025 16:38:08 +0100 Subject: [PATCH 1/2] Update versions of C++ libraries spdlog and nlohmann_json --- cmake/conan_utils.cmake | 2 +- cmake/dependency_utils.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/conan_utils.cmake b/cmake/conan_utils.cmake index aefd4f8540..3646462761 100644 --- a/cmake/conan_utils.cmake +++ b/cmake/conan_utils.cmake @@ -10,7 +10,7 @@ macro(setup_conan) # Right now every dependency shall be static set(CONAN_OPTIONS ${CONAN_OPTIONS} "*:shared=False") - set(REQUIREMENTS nlohmann_json/3.1.1 spdlog/1.9.2) + set(REQUIREMENTS nlohmann_json/3.11.3 spdlog/1.15.0) list(APPEND AER_CONAN_LIBS nlohmann_json spdlog) if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") list(APPEND AER_CONAN_LIBS llvm-openmp) diff --git a/cmake/dependency_utils.cmake b/cmake/dependency_utils.cmake index 8fd3003a55..8192f7a9d8 100644 --- a/cmake/dependency_utils.cmake +++ b/cmake/dependency_utils.cmake @@ -23,8 +23,8 @@ endmacro() macro(_use_system_libraries) # Use system libraries - _import_aer_system_dependency(nlohmann_json 3.1.1) - _import_aer_system_dependency(spdlog 1.9.2) + _import_aer_system_dependency(nlohmann_json 3.11.3) + _import_aer_system_dependency(spdlog 1.15.0) if(AER_THRUST_BACKEND AND NOT AER_THRUST_BACKEND STREQUAL "CUDA") string(TOLOWER ${AER_THRUST_BACKEND} THRUST_BACKEND) From 4bca76df5f249ec2b9dec57e570ab8a52cdac6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iy=C3=A1n=20M=C3=A9ndez=20Veiga?= Date: Thu, 9 Jan 2025 16:48:28 +0100 Subject: [PATCH 2/2] Downgrade spdlog to 1.14.1 This is because 1.15.0 was released on November 9, 2024. But Conan 1.x stop receiving updated on November 4, 2024. --- cmake/conan_utils.cmake | 2 +- cmake/dependency_utils.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/conan_utils.cmake b/cmake/conan_utils.cmake index 3646462761..686d55c80a 100644 --- a/cmake/conan_utils.cmake +++ b/cmake/conan_utils.cmake @@ -10,7 +10,7 @@ macro(setup_conan) # Right now every dependency shall be static set(CONAN_OPTIONS ${CONAN_OPTIONS} "*:shared=False") - set(REQUIREMENTS nlohmann_json/3.11.3 spdlog/1.15.0) + set(REQUIREMENTS nlohmann_json/3.11.3 spdlog/1.14.1) list(APPEND AER_CONAN_LIBS nlohmann_json spdlog) if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") list(APPEND AER_CONAN_LIBS llvm-openmp) diff --git a/cmake/dependency_utils.cmake b/cmake/dependency_utils.cmake index 8192f7a9d8..5cc64fdc23 100644 --- a/cmake/dependency_utils.cmake +++ b/cmake/dependency_utils.cmake @@ -24,7 +24,7 @@ endmacro() macro(_use_system_libraries) # Use system libraries _import_aer_system_dependency(nlohmann_json 3.11.3) - _import_aer_system_dependency(spdlog 1.15.0) + _import_aer_system_dependency(spdlog 1.14.1) if(AER_THRUST_BACKEND AND NOT AER_THRUST_BACKEND STREQUAL "CUDA") string(TOLOWER ${AER_THRUST_BACKEND} THRUST_BACKEND)