Skip to content

Commit

Permalink
Merge branch '5-update-deps-to-lima-core-1-9-20-which-introduces-a-bi…
Browse files Browse the repository at this point in the history
…nary-incompatibility-with-automutex-class' into 'master'

Resolve "Update deps to lima-core>=1.9.20 which introduces a binary incompatibility with AutoMutex class"

Closes #5

See merge request limagroup/Lima-camera-frelon!21
  • Loading branch information
claustre committed Nov 25, 2022
2 parents 14b151f + 2d67a9a commit 767a526
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions conda/camera/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ c_compiler:
cxx_compiler:
- vs2017 # [win]
python:
- 3.7
- 3.8
- 3.9
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
Expand Down
2 changes: 1 addition & 1 deletion conda/camera/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ requirements:
host:
- python {{ python }}
- sip 4.19* # API v12.7
- lima-core
- lima-core >=1.9.20
- lima-common-espia
build:
- cmake
Expand Down

0 comments on commit 767a526

Please sign in to comment.