Code

Cmake: make conan optional#999

Code

Merged

chriseclectic merged 30 commits intoQiskit:masterQiskit/qiskit-aer:masterfrom vvilpas:conan_optionalvvilpas/qiskit-aer:conan_optionalCopy head branch name to clipboardNov 4, 2020

+190-48

Commits

Commits on Aug 11, 2020

• cmake: make conan optional

  drewrisinger

  committed
  0aeecb3

  Copy full SHA for 0aeecb3

• CONTRIBUTING: add USE_CONAN CMake flag

  drewrisinger

  committed
  3e192c0

  Copy full SHA for 3e192c0

• releasenotes: add USE_CONAN CMake flag

  drewrisinger

  committed
  647345a

  Copy full SHA for 647345a

• CONTRIBUTING: remove trailing spaces

  drewrisinger

  committed
  887fe73

  Copy full SHA for 887fe73

• cmake: add USE_CONAN environment variable

  Show description for 33e2f11
  drewrisinger

  committed
  33e2f11

  Copy full SHA for 33e2f11

• treewide: fix dependent spelling

  drewrisinger

  committed
  7e1c5db

  Copy full SHA for 7e1c5db

Commits on Sep 9, 2020

• cmake: fix USE_CONAN precedence

  Show description for f714304
  drewrisinger

  committed
  f714304

  Copy full SHA for f714304

• cmake: add common dependency imports

  Show description for 75215a0
  drewrisinger

  committed
  75215a0

  Copy full SHA for 75215a0

• cmake: convert to AER_DEPENDENCY_PKG

  Show description for bf9186d
  drewrisinger

  committed
  bf9186d

  Copy full SHA for bf9186d

• dependencies: fix cmake importing

  Show description for c7c0e21
  drewrisinger

  committed
  c7c0e21

  Copy full SHA for c7c0e21

• cmake: refactor dependency load to macro

  Show description for 788d94c
  drewrisinger

  committed
  788d94c

  Copy full SHA for 788d94c

• setup.py: use USE_CONAN env variable

  Show description for 1ac5997
  drewrisinger

  committed
  1ac5997

  Copy full SHA for 1ac5997

• setup.py: refactor checking required imports

  Show description for 9b28cb9
  drewrisinger

  committed
  9b28cb9

  Copy full SHA for 9b28cb9

• cmake: linking fixup

  Show description for 7bf17a7
  drewrisinger

  committed
  7bf17a7

  Copy full SHA for 7bf17a7

Commits on Oct 16, 2020

• Merge branch 'master' into dr-pr-conan-optional

  vvilpas

  authored
  41dad37

  Copy full SHA for 41dad37

Commits on Oct 20, 2020

• Fixing Coanan build. Some fixes for non conan build

  vvilpas

  committed
  5720e23

  Copy full SHA for 5720e23

• Leave Macos out of non conan build for now

  vvilpas

  committed
  4c5f466

  Copy full SHA for 4c5f466

• Remove not needed thrust include dirs. Fix Thrust name for find package

  vvilpas

  committed
  a64cb2c

  Copy full SHA for a64cb2c

• Merge branch 'master' into conan_optional

  vvilpas

  authored
  4d8fd33

  Copy full SHA for 4d8fd33

• Revert setup.py to make CI work again

  vvilpas

  committed
  8952f2f

  Copy full SHA for 8952f2f

Commits on Oct 21, 2020

• Explicitly add thrust header path for conan

  vvilpas

  committed
  55ef04e

  Copy full SHA for 55ef04e

• Catch2 package to AER_DEPENDENCY_PKG

  vvilpas

  committed
  44b0deb

  Copy full SHA for 44b0deb

• Search for any version if required version is not found, only when Conan is disabled

  vvilpas

  committed
  b2f193d

  Copy full SHA for b2f193d

• Remove version when looking for any available library

  vvilpas

  committed
  47d0bd3

  Copy full SHA for 47d0bd3

• Merge branch 'master' into conan_optional

  vvilpas

  authored
  afcf486

  Copy full SHA for afcf486

Commits on Oct 22, 2020

• Allow no conan on macos

  vvilpas

  committed
  a4d94ea

  Copy full SHA for a4d94ea

• Fix win build

  vvilpas

  committed
  0c460e6

  Copy full SHA for 0c460e6

Commits on Oct 23, 2020

• Change flag to disable instead of use, making more explicit that conan is the default

  vvilpas

  committed
  e631420

  Copy full SHA for e631420

Commits on Oct 28, 2020

• Merge branch 'master' into conan_optional

  vvilpas

  authored
  691aeb1

  Copy full SHA for 691aeb1

Commits on Nov 3, 2020

• Merge branch 'master' into conan_optional

  chriseclectic

  authored
  0b12288

  Copy full SHA for 0b12288