try to fix build-errors (again)

conda-forge · Jan 14, 2019 · 9a3bad8 · 9a3bad8
1 parent 3c83682
commit 9a3bad8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 34 deletions.
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -4,19 +4,19 @@ cd build
 REM TODO: can not find tkint.h -> disabling GUI for WIN
 
 cmake .. -G "Ninja" ^
-    -D CMAKE_BUILD_TYPE="Release" ^
-    -D INSTALL_DIR_LAYOUT="Unix" ^
-    -D CMAKE_PREFIX_PATH:FILEPATH="%PREFIX%" ^
-    -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
-    -D NG_INSTALL_DIR_INCLUDE:FILEPATH="%LIBRARY_PREFIX%/include/netgen" ^
-    -D OCC_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%/include/opencascade" ^
-    -D OCC_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%/lib" ^
-    -D USE_OCC=ON ^
-    -D USE_PYTHON=ON ^
-    -D USE_GUI=OFF ^
-    -D BUILD_WITH_CONDA=ON ^
-    -D DYNAMIC_LINK_PYTHON=OFF ^
-    -D USE_SUPERBUILD=OFF
+    -DCMAKE_BUILD_TYPE="Release" ^
+    -DINSTALL_DIR_LAYOUT="Unix" ^
+    -DCMAKE_PREFIX_PATH:FILEPATH="%PREFIX%" ^
+    -DCMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
+    -DNG_INSTALL_DIR_INCLUDE:FILEPATH="%LIBRARY_PREFIX%/include/netgen" ^
+    -DOCC_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%/include/opencascade" ^
+    -DOCC_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%/lib" ^
+    -DUSE_OCC=ON ^
+    -DUSE_PYTHON=ON ^
+    -DUSE_GUI=OFF ^
+    -DBUILD_WITH_CONDA=ON ^
+    -DDYNAMIC_LINK_PYTHON=OFF ^
+    -DUSE_SUPERBUILD=OFF
 
 if errorlevel 1 exit 1
 ninja install

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -11,25 +11,24 @@ if [[ ${c_compiler} != "toolchain_c" ]]; then
 fi
 
 cmake .. -G "Ninja" \
-      -D CMAKE_BUILD_TYPE=Release \
-      -D CMAKE_INSTALL_PREFIX=$PREFIX \
-      -D NG_INSTALL_DIR_INCLUDE=$PREFIX/include/netgen \
-      -D NG_INSTALL_DIR_PYTHON=${SP_DIR} \
-      -D NG_INSTALL_DIR_BIN=bin \
-      -D NG_INSTALL_DIR_LIB=lib \
-      -D NG_INSTALL_DIR_CMAKE=lib/cmake/netgen \
-      -D NG_INSTALL_DIR_RES=share \
-      -D OCC_INCLUDE_DIR=$PREFIX/include/opencascade \
-      -D OCC_LIBRARY_DIR=$PREFIX/lib \
-      -D USE_NATIVE_ARCH=OFF \
-      -D USE_OCC=ON \
-      -D USE_PYTHON=ON \
-      -D USE_GUI=OFF \
-      -D USE_SUPERBUILD=OFF \
-      -D BUILD_WITH_CONDA=ON \
-      -D DYNAMIC_LINK_PYTHON=OFF \
-      ${CMAKE_PLATFORM_FLAGS[@]} \
-      ..
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX=$PREFIX \
+      -DNG_INSTALL_DIR_INCLUDE=$PREFIX/include/netgen \
+      -DNG_INSTALL_DIR_PYTHON=${SP_DIR} \
+      -DNG_INSTALL_DIR_BIN=bin \
+      -DNG_INSTALL_DIR_LIB=lib \
+      -DNG_INSTALL_DIR_CMAKE=lib/cmake/netgen \
+      -DNG_INSTALL_DIR_RES=share \
+      -DOCC_INCLUDE_DIR=$PREFIX/include/opencascade \
+      -DOCC_LIBRARY_DIR=$PREFIX/lib \
+      -DUSE_NATIVE_ARCH=OFF \
+      -DUSE_OCC=ON \
+      -DUSE_PYTHON=ON \
+      -DUSE_GUI=OFF \
+      -DUSE_SUPERBUILD=OFF \
+      -DBUILD_WITH_CONDA=ON \
+      -DDYNAMIC_LINK_PYTHON=OFF \
+      ${CMAKE_PLATFORM_FLAGS[@]}
 
 ninja install -v
 
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "netgen" %}
 {% set version = "6.2.1811.b0" %}
-{% set sha256 = "3a1e92e2bbcce659727e24ff9efbb51785842517093d6972c85feb1f51745433" %}
+{% set sha256 = "8280c113c335210fa670c6d8c116cbb6c5bf061e22cb7c2a2a1ea27bee23eaef" %}
 
 
 package:
@@ -10,7 +10,7 @@ package:
 source:
     fn: netgen_v{{ version }}.tar.gz
     # url: https://github.com/NGSolve/netgen/archive/v{{ version }}.tar.gz
-    url: https://github.com/NGSolve/netgen/archive/97bfaa001013aa669d432077cb6132fd3ac21d6e.tar.gz
+    url: https://github.com/NGSolve/netgen/archive/813d1b920835d28687263f34a6a076878d7db099.tar.gz
     sha256: {{ sha256 }}
 
 build: