From 1e125e3d70b2a485c28ca7c5cd6ee984484525c1 Mon Sep 17 00:00:00 2001 From: Alejandro Homs Puron <ahoms@esrf.fr> Date: Mon, 24 Feb 2020 10:36:27 +0100 Subject: [PATCH 1/2] Revert useless Conda build patch: * Start CMake build only after a successful configure stage --- conda/camera/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/camera/build.sh b/conda/camera/build.sh index 820deb7..f0b0719 100644 --- 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 --build build --target install +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 --build build --target install -- GitLab From 5c008498685d0d97887ba182031139516f2afe4d Mon Sep 17 00:00:00 2001 From: Alejandro Homs Puron <ahoms@esrf.fr> Date: Mon, 24 Feb 2020 11:49:41 +0100 Subject: [PATCH 2/2] Drop python 2.7 build --- conda/camera/conda_build_config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/camera/conda_build_config.yaml b/conda/camera/conda_build_config.yaml index 37b36eb..87fd5f3 100644 --- a/conda/camera/conda_build_config.yaml +++ b/conda/camera/conda_build_config.yaml @@ -5,7 +5,6 @@ c_compiler: cxx_compiler: - vs2017 # [win] python: - - 2.7 # [linux] - 3.6 - 3.7 # This differs from target_platform in that it determines what subdir the compiler -- GitLab