From 3e0c293407ba4388e18473184ceddaa7534b0ee3 Mon Sep 17 00:00:00 2001 From: amystamile-usgs <astamile@usgs.gov> Date: Thu, 6 Feb 2025 08:38:40 -0700 Subject: [PATCH] working conda-forge changes --- core_recipe/build.sh | 6 +++--- core_recipe/meta.yaml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core_recipe/build.sh b/core_recipe/build.sh index 46595c7ddf..e373f071ea 100644 --- a/core_recipe/build.sh +++ b/core_recipe/build.sh @@ -1,8 +1,8 @@ -mkdir build_core install_core +mkdir build_core cd build_core export ISISROOT=$PWD -cmake -GNinja -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DISIS_BUILD_SWIG=ON -DCMAKE_INSTALL_PREFIX=../install_core ../isis/src/core -ninja core && ninja install +cmake -GNinja -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DISIS_BUILD_SWIG=ON -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis/src/core +ninja install cd swig/python/ ${PYTHON} setup.py install \ No newline at end of file diff --git a/core_recipe/meta.yaml b/core_recipe/meta.yaml index 45627b014c..c02de6dd41 100644 --- a/core_recipe/meta.yaml +++ b/core_recipe/meta.yaml @@ -32,7 +32,6 @@ requirements: - swig run: - python =3.11 - - mesalib - {{ pin_compatible('qt-main', max_pin='x.x') }} - {{ pin_compatible('nlohmann_json', min_pin='x.x', max_pin='x.x') }} -- GitLab