From 7d572372f8a92bbef6b1c5c6043f41d71228899e Mon Sep 17 00:00:00 2001 From: Christian Godenschwager <christian.godenschwager@fau.de> Date: Tue, 16 Jan 2018 12:05:15 +0100 Subject: [PATCH] Set some CMake variables in Conda python packages CMAKE_FIND_ROOT to be able to find external libraries like openmesh CMAKE_INSTALL_PREFIX for a possible later "make install" --- utilities/conda/withLbm/build.sh | 9 +++++++-- utilities/conda/withoutLbm/build.sh | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/utilities/conda/withLbm/build.sh b/utilities/conda/withLbm/build.sh index 4a5e9048c..b873eaf14 100644 --- a/utilities/conda/withLbm/build.sh +++ b/utilities/conda/withLbm/build.sh @@ -1,7 +1,12 @@ mkdir build cd build -export BOOST_ROOT=$PREFIX -cmake .. -DWALBERLA_BUILD_WITH_PYTHON=ON -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON -DWALBERLA_BUILD_WITH_PYTHON_LBM=ON +cmake \ + -DCMAKE_FIND_ROOT_PATH=${PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${PREFIX} \ + -DWALBERLA_BUILD_WITH_PYTHON=ON \ + -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON \ + -DWALBERLA_BUILD_WITH_PYTHON_LBM=ON \ + .. make -j ${CPU_COUNT} pythonModuleInstall diff --git a/utilities/conda/withoutLbm/build.sh b/utilities/conda/withoutLbm/build.sh index 7fc4cc7c0..b873eaf14 100644 --- a/utilities/conda/withoutLbm/build.sh +++ b/utilities/conda/withoutLbm/build.sh @@ -1,7 +1,12 @@ mkdir build cd build -export BOOST_ROOT=$PREFIX -cmake .. -DWALBERLA_BUILD_WITH_PYTHON=ON -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON +cmake \ + -DCMAKE_FIND_ROOT_PATH=${PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${PREFIX} \ + -DWALBERLA_BUILD_WITH_PYTHON=ON \ + -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON \ + -DWALBERLA_BUILD_WITH_PYTHON_LBM=ON \ + .. make -j ${CPU_COUNT} pythonModuleInstall -- GitLab