Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cpp deps #2283

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+3 −3
Open

Update cpp deps #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51d1efc
Update versions of C++ libraries spdlog and nlohmann_json
iyanmv Jan 9, 2025
4bca76d
Downgrade spdlog to 1.14.1
iyanmv Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/conan_utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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)
Expand Down
4 changes: 2 additions & 2 deletions cmake/dependency_utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.1)

if(AER_THRUST_BACKEND AND NOT AER_THRUST_BACKEND STREQUAL "CUDA")
string(TOLOWER ${AER_THRUST_BACKEND} THRUST_BACKEND)
Expand Down
Loading