From 9f91109e6613dc828635ed615b31039cabeb9d5e Mon Sep 17 00:00:00 2001
From: Thomas Krijnen <t.krijnen@gmail.com>
Date: Sun, 21 Jan 2018 15:58:36 +0100
Subject: [PATCH] Update conda

---
 conda/build.sh  | 16 ++++++++++++++++
 conda/meta.yaml | 12 +++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/conda/build.sh b/conda/build.sh
index a9a744c27e..27ee015269 100644
--- a/conda/build.sh
+++ b/conda/build.sh
@@ -1,3 +1,16 @@
+# From https://github.com/tpaviot/pythonocc-core/blob/master/ci/conda/build.sh
+if [ "$PY3K" == "1" ]; then
+    MY_PY_VER="${PY_VER}m"
+else
+    MY_PY_VER="${PY_VER}"
+fi
+
+if [ `uname` == Darwin ]; then
+    PY_LIB="libpython${MY_PY_VER}.dylib"
+else
+    PY_LIB="libpython${MY_PY_VER}.so"
+fi
+
 mkdir build && cd build
 
 cmake \
@@ -7,6 +20,9 @@ cmake \
  -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
  -DOCC_INCLUDE_DIR=$PREFIX/include/oce \
  -DOCC_LIBRARY_DIR=$PREFIX/lib \
+ -DPYTHON_EXECUTABLE:FILEPATH=$PYTHON \
+ -DPYTHON_INCLUDE_DIR:PATH=$PREFIX/include/python$MY_PY_VER \
+ -DPYTHON_LIBRARY:FILEPATH=$PREFIX/lib/${PY_LIB} \
  -DCOLLADA_SUPPORT=Off \
  ../cmake
 
diff --git a/conda/meta.yaml b/conda/meta.yaml
index dd2b258914..71d814004d 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -9,21 +9,23 @@ source:
 build:
   number: 0
   features:
-    - vc9   [win and py27]
-    - vc10  [win and py34]
-    - vc14  [win and py35]
-    - vc14  [win and py36]
+    - vc9     # [win and py27]
+    - vc10    # [win and py34]
+    - vc14    # [win and py35]
+    - vc14    # [win and py36]
 
 requirements:
   build:
+    - gcc     # [osx]
     - make
     - python
     - oce==0.17.2
     - cmake
-    - swig >=3.0.9
+    - swig>=3.0.9
     - libboost
     - icu
   run:
+    - python
     - oce==0.17.2
     - libboost
     - icu