Merge branch '1-update-for-sdk-3-15-30092-2-only-one-with-bitflow-dri…

…ver-supported-by-ubuntu-20-04-kernel-version' into 'master' Resolve "update for sdk 3.15.30092.2, only one with bitflow driver supported by ubuntu 20.04 kernel version" Closes #1 See merge request limagroup/Lima-camera-andor3!7
esrf-bliss · Jan 25, 2023 · 39ee778 · 39ee778
2 parents e38062d + 3a264fc
commit 39ee778
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/conda/camera/build.sh b/conda/camera/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-cmake -Bbuild -H. -DLIMA_ENABLE_PYTHON=1 -DCAMERA_ENABLE_TESTS=1 -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX
+cmake -Bbuild -H. -GNinja -DLIMA_ENABLE_PYTHON=1 -DCAMERA_ENABLE_TESTS=1 -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_FIND_ROOT_PATH=$PREFIX
 cmake --build build --target install
diff --git a/conda/camera/conda_build_config.yaml b/conda/camera/conda_build_config.yaml
@@ -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.

diff --git a/conda/camera/meta.yaml b/conda/camera/meta.yaml
@@ -20,16 +20,16 @@ requirements:
     - python {{ python }}
     - sip 4.19*
     - lima-core >=1.9.20
-    - andor3-sdk 3.14
+    - andor3-sdk 3.15.30092.2
   build:
+    - ninja
     - cmake
-    - make
     - {{ compiler('cxx') }}
   run:
-    - python {{ python }}
+    - python
     - {{ pin_compatible('sip', min_pin='x.x.x', max_pin='x') }}
     - {{ pin_compatible('lima-core', max_pin='x.x') }}
-    - andor3-sdk 3.14
+    - andor3-sdk 3.15.30092.2
 
 test:
   requires:

diff --git a/conda/tango/build.sh b/conda/tango/build.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 cd tango/
-cmake -Bbuild -H. -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX
+cmake -Bbuild -H. -GNinja -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_FIND_ROOT_PATH=$PREFIX
 cmake --build build --target install
diff --git a/conda/tango/meta.yaml b/conda/tango/meta.yaml
@@ -19,7 +19,7 @@ build:
 requirements:
   build:
     - cmake
-    - make
+    - ninja
     - lima-core
   run:
     - lima-tango-server
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ build: @@
     requirements:
       build:
         - cmake
-        - make
+        - ninja
         - lima-core
       run:
         - lima-tango-server
@@ Expand Down @@