From 8f299434628e4cc2dfc5aff8f0c77da27620e685 Mon Sep 17 00:00:00 2001
From: looooo <sppedflyer@gmail.com>
Date: Tue, 24 Apr 2018 11:28:52 +0200
Subject: [PATCH] conda: update circle-ci build

---
 package/conda/build.sh  | 39 ++++++++++++++++++++++-----------------
 package/conda/meta.yaml | 40 ++++++++++++++++++++++------------------
 2 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/package/conda/build.sh b/package/conda/build.sh
index 4d6fc79f84..7e5eb862c8 100644
--- a/package/conda/build.sh
+++ b/package/conda/build.sh
@@ -1,23 +1,28 @@
 mkdir -p build
 cd build
 
-cmake -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=$PREFIX \
-      -DCMAKE_PREFIX_PATH=$PREFIX \
-      -DBUILD_QT5=ON \
-      -DNETGENDATA=$PREFIX/include/netgen \
-      -DNETGEN_INCLUDEDIR=$PREFIX/include/netgen \
-      -DNGLIB_INCLUDE_DIR=$PREFIX/include/nglib \
-      -DOCC_INCLUDE_DIR=$PREFIX/include/opencascade \
-      -DOCC_LIBRARY_DIR=$PREFIX/lib \
-      -DOCC_LIBRARIES=$PREFIX/lib CACHE PATH \
-      -DFREECAD_USE_OCC_VARIANT="Official Version" \
-      -DOCC_OCAF_LIBRARIES=$PREFIX/lib CACHE PATH \
-      -DSWIG_DIR=$PREFIX/share/swig/3.0.8 \
-      -DSWIG_EXECUTABLE=$PREFIX/bin/swig \
-      -DPYTHON_EXECUTABLE=$PYTHON \
-      -DBUILD_FEM_NETGEN=YES \
-      -DUSE_BOOST_PYTHON=NO \
+cmake -D CMAKE_BUILD_TYPE=Release \
+      -D CMAKE_INSTALL_PREFIX=$PREFIX \
+      -D CMAKE_PREFIX_PATH=$PREFIX \
+      -D CMAKE_LIBRARY_PATH=$PREFIX/lib \
+      -D BUILD_QT5=ON \
+      -D NETGENDATA=$PREFIX/include/netgen \
+      -D NETGEN_INCLUDEDIR=$PREFIX/include/netgen \
+      -D NGLIB_INCLUDE_DIR=$PREFIX/include/nglib \
+      -D OCC_INCLUDE_DIR=$PREFIX/include/opencascade \
+      -D OCC_LIBRARY_DIR=$PREFIX/lib \
+      -D OCC_LIBRARIES=$PREFIX/lib CACHE PATH \
+      -D FREECAD_USE_OCC_VARIANT="Official Version" \
+      -D OCC_OCAF_LIBRARIES=$PREFIX/lib CACHE PATH \
+      -D SWIG_DIR=$PREFIX/share/swig/3.0.8 \
+      -D SWIG_EXECUTABLE=$PREFIX/bin/swig \
+      -D PYTHON_EXECUTABLE=$PYTHON \
+      -D BUILD_FEM_NETGEN=YES \
+      -D USE_BOOST_PYTHON=NO \
+      -D FREECAD_USE_PYBIND11=YES \
+      -D BUILD_ENABLE_CXX11=ON \
+      -D SMESH_INCLUDE_DIR=$PREFIX/include/smesh \
+      -D FREECAD_USE_EXTERNAL_SMESH=ON \
       /source
 
 make -j${CPU_COUNT} 2>&1 | tee output.txt
diff --git a/package/conda/meta.yaml b/package/conda/meta.yaml
index cbaaa7fe58..410d1e045b 100644
--- a/package/conda/meta.yaml
+++ b/package/conda/meta.yaml
@@ -1,38 +1,41 @@
 package:
     name: freecad_daily
-    version: 0.17
+    version: 0.18
 
 build:
     number: 0
 
 requirements:
     build:
-        - nomkl  # [unix]
+        - toolchain
+        - gcc  # [unix]
         - vc 14  # [win and py>=35]
-        - ninja  # [win and py>=35]
+        - ninja
         - cmake
+        - nomkl  # [unix]
         - swig
         - eigen
         - boost-cpp 1.66.0
-        - pybind11  # [unix]
         - boost 1.66.0  # [win]
+        - pybind11  # [unix]
         - python
         - matplotlib
         - coin3d
         - pivy
-        - qt 5.*
-        - pyside2  2.0.0.dev0 py36_0  # [unix]
-        - pyside2  2.0.0.dev0 py36_vc14_0  # [win]
+        - qt 5.6.*
+        - pyside2 5.6.*
         - occt 7.2.0
-        - netgen
-        - vtk 8.*
-        - libmed
+        - smesh
+        - netgen  # [not win32]
+        - vtk 8.1.*
         - hdf5
-        - xerces-c 3.2.0
+        - xerces-c 3.2.*
         - zlib 1.2.*
         - doxygen
         - git
+        - libglu  # [linux]
     run:
+        - libgcc  # [unix]
         - vc 14  # [win and py>=35]
         - boost-cpp 1.66.0
         - boost 1.66.0  # [win]
@@ -41,16 +44,17 @@ requirements:
         - matplotlib
         - coin3d
         - pivy
-        - qt 5.*
-        - pyside2
-        - occt
-        - netgen
-        - vtk 8.*
-        - libmed
-        - xerces-c 3.2.0
+        - qt 5.6.*
+        - pyside2 5.6.*
+        - occt 7.2.0
+        - vtk 8.1.*
+        - smesh
+        - netgen  # [not win32]
+        - xerces-c 3.2.*
         - zlib 1.2*
         - git
         - calculix  # [unix]
+        - libglu  # [linux]
 about:
     summary: freecad