Wrong python found by fit2x

Fluorescence-Tools · Dec 8, 2024 · 74620af · 74620af
1 parent a61191c
commit 74620af
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
@@ -50,20 +50,18 @@ cd ../../..
 
 # Build fit2x
 cd modules/fit2x
-git switch master && git pull origin master
+git switch master
 rm -rf build && mkdir build && cd build
-cmake -S .. -B . \
-  -DCMAKE_CXX_COMPILER="${CXX}" \
-  -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-  -DCMAKE_PREFIX_PATH="$PREFIX" \
-  -DBUILD_PYTHON_INTERFACE=ON \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$SP_DIR" \
-  -DCMAKE_SWIG_OUTDIR="$SP_DIR" \
-  -DPython_ROOT_DIR="${PREFIX}/bin" \
-  -DPython_EXECUTABLE="${PYTHON}"
-  -G Ninja
-ninja install -j ${CPU_COUNT}
+cmake \
+ -DCMAKE_INSTALL_PREFIX="$PREFIX" \
+ -DCMAKE_PREFIX_PATH="$PREFIX" \
+ -DBUILD_PYTHON_INTERFACE=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$SP_DIR" \
+ -DCMAKE_SWIG_OUTDIR="$SP_DIR" \
+ -DPython_ROOT_DIR="${PREFIX}/bin" \
+ ..
+make && make install
 cd ../../..
 
 

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -19,8 +19,9 @@ build:
     {% endfor %}
 
 requirements:
-  host:
+  build:
     - {{ compiler('cxx') }}
+  host:
     - git
     - cmake
     - make         # [not win]