Enable openmesh in conda packages

Updated conda packages to cond build > 3.1.4 using host section
See https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#host

.gitlab-ci.yml

@@ -1348,12 +1348,14 @@ msvc-14.1_MpiOnly:
 .conda-deploy: &conda_deploy_definition
    stage: deploy
    before_script:
+      - conda update -y conda
+      - conda update -y python
       - conda install -y conda-build anaconda-client
-      - conda install conda-build==3.0.27  # building with conda-build version 3.2.1 leads to empty package
       - anaconda login --username $CONDA_DEPLOY_USER --password $CONDA_DEPLOY_PASSWORD --hostname $CI_JOB_ID
       - conda config --set anaconda_upload yes
       - conda config --add channels lssfau
-      - conda
+      - conda -V
+      - conda build -V
    after_script:
       - anaconda logout
    dependencies: []

utilities/conda/openmesh/build.sh

 #!/bin/sh
 
+sed -i '93a#include <sys/time.h>' src/OpenMesh/Tools/Utils/conio.cc
+
 mkdir -p build && cd build
 
 cmake \
@@ -11,6 +13,8 @@ cmake \
   -DCMAKE_CXX_FLAGS="-std=c++11"\
   ..
 
+#cat src/Python/PythonLog.txt
+
 make install -j${CPU_COUNT}
 mv ${PREFIX}/lib/python/* ${SP_DIR}
 

utilities/conda/openmesh/meta.yaml

@@ -16,9 +16,10 @@ source:
 requirements:
   build:
     - {{ compiler('cxx') }}
-    - python
     - cmake
     - make
+  host:
+    - python
     - boost
   run:
     - python

utilities/conda/withLbm/build.sh

@@ -2,6 +2,6 @@ mkdir build
 cd build
 export BOOST_ROOT=$PREFIX
 
-cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_PYTHON_LBM=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=ON -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON -DWALBERLA_BUILD_WITH_PYTHON_LBM=ON
 
-make -j 8 pythonModuleInstall
+make -j ${CPU_COUNT} pythonModuleInstall

utilities/conda/withLbm/meta.yaml

@@ -13,18 +13,19 @@ build:
 requirements:
   build:
   - {{ compiler('cxx') }}
-  - python
   - git
-  - boost
   - cmake
   - make
+  host:
+  - python
+  - boost
   - mpich2 [linux]
-  #- openmesh
+  - openmesh
   run:
   - python >=3.6
   - boost
   - numpy
   - mpich2 [linux]
-  #- openmesh
+  - openmesh
 source:
   path: ../../..

utilities/conda/withoutLbm/build.sh

@@ -2,6 +2,6 @@ mkdir build
 cd build
 export BOOST_ROOT=$PREFIX
 
-cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=ON -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON
 
-make -j 8 pythonModuleInstall
+make -j ${CPU_COUNT} pythonModuleInstall

utilities/conda/withoutLbm/meta.yaml

@@ -13,21 +13,24 @@ build:
 requirements:
   build:
   - {{ compiler('cxx') }}
-  - python
   - git
-  - boost
   - cmake [linux]
   - cmake >=3.7.0 [win]
   - make
+  host:
+  - python
+  - boost
   - mpich2 [linux]
+  - openmesh
   run:
   - python
   - boost
   - numpy
   - mpich2 [linux]
+  - openmesh
 source:
   path: ../../..
 
 test:
   imports:
-    - waLBerla
\ No newline at end of file
+    - waLBerla