tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index efeacfc..77bd6bd 100755
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -121,7 +121,11 @@ endif()
6 # Looking for external libraries
7 #
8
9-setup_conan()
10+find_package(muparserx REQUIRED)
11+find_package(nlohmann_json REQUIRED)
12+find_package(spdlog REQUIRED)
13+# for tests only
14+find_package(catch2)
15
16 # If we do not set them with a space CMake fails afterwards if nothing is set for this vars!
17 set(AER_LINKER_FLAGS " ")
18@@ -269,16 +273,16 @@ endif()
19 set(AER_LIBRARIES
20 ${AER_LIBRARIES}
21 ${BLAS_LIBRARIES}
22- CONAN_PKG::nlohmann_json
23+ nlohmann_json
24 Threads::Threads
25- CONAN_PKG::spdlog
26+ spdlog
27 ${DL_LIB}
28 ${THRUST_DEPENDANT_LIBS})
29
30 set(AER_COMPILER_DEFINITIONS ${AER_COMPILER_DEFINITIONS} ${CONAN_DEFINES})
31 # Cython build is only enabled if building through scikit-build.
32 if(SKBUILD) # Terra Addon build
33- set(AER_LIBRARIES ${AER_LIBRARIES} CONAN_PKG::muparserx)
34+ set(AER_LIBRARIES ${AER_LIBRARIES} muparserx)
35 add_subdirectory(qiskit/providers/aer/pulse/qutip_extra_lite/cy)
36 add_subdirectory(qiskit/providers/aer/backends/wrappers)
37 add_subdirectory(src/open_pulse)
38diff --git a/setup.py b/setup.py
39index fd71e9f..1561cc4 100644
40--- a/setup.py
41+++ b/setup.py
42@@ -11,12 +11,6 @@ import inspect
43
44 PACKAGE_NAME = os.getenv('QISKIT_AER_PACKAGE_NAME', 'qiskit-aer')
45
46-try:
47- from conans import client
48-except ImportError:
49- subprocess.call([sys.executable, '-m', 'pip', 'install', 'conan'])
50- from conans import client
51-
52 try:
53 from skbuild import setup
54 except ImportError:
55@@ -46,8 +40,6 @@ common_requirements = [
56
57 setup_requirements = common_requirements + [
58 'scikit-build',
59- 'cmake!=3.17,!=3.17.0',
60- 'conan>=1.22.2'
61 ]
62
63 requirements = common_requirements + ['qiskit-terra>=0.12.0']