From ca8d2164473dd208b6fbddf894cc3c6958a8784d Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Tue, 13 Oct 2020 12:02:44 +0200
Subject: [PATCH] adding build_conda_package.bat and updating some build
scripts
---
Application/trex_build_unix.sh | 9 +++++++++
conda/build_conda_package.bat | 1 +
conda/build_conda_package.sh | 4 +---
3 files changed, 11 insertions(+), 3 deletions(-)
create mode 100755 conda/build_conda_package.bat
diff --git a/Application/trex_build_unix.sh b/Application/trex_build_unix.sh
index 375dba1..f163769 100755
--- a/Application/trex_build_unix.sh
+++ b/Application/trex_build_unix.sh
@@ -53,6 +53,9 @@ if [ "$(uname)" == "Linux" ]; then
-DPYTHON_EXECUTABLE:FILEPATH=$(which python3) \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_FFMPEG=ON \
+ -DTREX_BUILD_ZLIB=ON \
+ -DTREX_BUILD_ZIP=ON \
+ -DTREX_BUILD_PNG=ON \
-DCMAKE_PREFIX_PATH="$CONDA_PREFIX;$CONDA_PREFIX/lib/pkgconfig;$CONDA_PREFIX/lib" \
-DWITH_PYLON=ON
else
@@ -62,6 +65,9 @@ if [ "$(uname)" == "Linux" ]; then
-DPYTHON_EXECUTABLE:FILEPATH=$(which python3) \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_FFMPEG=ON \
+ -DTREX_BUILD_ZLIB=ON \
+ -DTREX_BUILD_ZIP=ON \
+ -DTREX_BUILD_PNG=ON \
-DCMAKE_PREFIX_PATH="$PKG_CONFIG_PATH" \
-DWITH_PYLON=ON
fi
@@ -103,6 +109,9 @@ else
-DPYTHON_LIBRARY:FILEPATH=$(python3 ../find_library.py) \
-DPYTHON_EXECUTABLE:FILEPATH=$(which python3) \
-DCMAKE_BUILD_TYPE=Release \
+ -DTREX_BUILD_ZLIB=ON \
+ -DTREX_BUILD_ZIP=ON \
+ -DTREX_BUILD_PNG=ON \
-G Xcode \
-DWITH_FFMPEG=ON
fi
diff --git a/conda/build_conda_package.bat b/conda/build_conda_package.bat
new file mode 100755
index 0000000..0649c1f
--- /dev/null
+++ b/conda/build_conda_package.bat
@@ -0,0 +1 @@
+conda build .
diff --git a/conda/build_conda_package.sh b/conda/build_conda_package.sh
index fd6e763..923498e 100755
--- a/conda/build_conda_package.sh
+++ b/conda/build_conda_package.sh
@@ -1,7 +1,5 @@
-conda build purge
-
if [ "$(uname)" == "Linux" ]; then
conda build . -c conda-forge
else
- conda build . -c anaconda
+ conda build .
fi
--
GitLab