scnc
/
qiskit-aer
mirror of https://github.com/Qiskit/qiskit-aer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update openmp to 12.0.1. (#1348)

This commit is contained in:
Victor Villar 2021-11-18 20:03:55 +01:00 committed by GitHub
parent 7402cd093d
commit 439c86ae22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -88,10 +88,9 @@ if(NOT CMAKE_BUILD_TYPE)
endif(NOT CMAKE_BUILD_TYPE)
if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# In order to build for MacOSX 10.9 and above with Clang, we need to force the "deployment target" to 10.9
# and force using libc++ instead of the default for this target: libstdc++ otherwise we could not
# use C++11/14
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE)
# In order to build for MacOSX 10.9 and above with Clang, we need to
# force using libc++ instead of the default for this target: libstdc++
# otherwise we could not use C++11/14
enable_cxx_compiler_flag_if_supported("-stdlib=libc++")
endif()

4
cmake/conan_utils.cmake
View File

@ -13,7 +13,7 @@ macro(setup_conan)
set(REQUIREMENTS nlohmann_json/3.1.1 spdlog/1.5.0)
list(APPEND AER_CONAN_LIBS nlohmann_json spdlog)
if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(REQUIREMENTS ${REQUIREMENTS} llvm-openmp/8.0.1)
set(REQUIREMENTS ${REQUIREMENTS} llvm-openmp/12.0.1)
list(APPEND AER_CONAN_LIBS llvm-openmp)
if(SKBUILD)
set(CONAN_OPTIONS ${CONAN_OPTIONS} "llvm-openmp:shared=True")
@ -39,7 +39,7 @@ macro(setup_conan)
endif()
if(BUILD_TESTS)
set(REQUIREMENTS ${REQUIREMENTS} catch2/2.12.1)
set(REQUIREMENTS ${REQUIREMENTS} catch2/2.13.6)
list(APPEND AER_CONAN_LIBS catch2)
endif()

2
cmake/dependency_utils.cmake
View File

@ -36,7 +36,7 @@ macro(_use_system_libraries)
endif()
if(BUILD_TESTS)
_import_aer_system_dependency(Catch2 2.12.1)
_import_aer_system_dependency(Catch2 2.13.6)
endif()
if(APPLE)

2
setup.py
View File

@ -104,7 +104,7 @@ with open(README_PATH) as readme_file:
README = readme_file.read()
cmake_args = ["-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9"]
cmake_args = []
is_win_32_bit = (platform.system() == 'Windows' and platform.architecture()[0] == "32bit")
if is_win_32_bit:
cmake_args.append("-DCMAKE_GENERATOR_PLATFORM=Win32")