Update conda receipe to 7.6.2

tpaviot · Aug 16, 2022 · f4158e5 · f4158e5
1 parent 25a2f6f
commit f4158e5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/ci/conda/bld.bat b/ci/conda/bld.bat
@@ -2,14 +2,17 @@ mkdir build
 cd build
 
 REM Configure step
-cmake -G "Ninja" -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
+cmake -G "Ninja" ^
  -DPYTHONOCC_BUILD_TYPE=Release ^
- -DPYTHONOCC_MESHDS_NUMPY=ON ^
  -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
+ -DCMAKE_LIBRARY_PATH="%LIBRARY_LIB%" ^
+ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
  -DCMAKE_SYSTEM_PREFIX_PATH="%LIBRARY_PREFIX%" ^
  -DPython3_FIND_STRATEGY=LOCATION ^
  -DPython3_FIND_REGISTRY=NEVER ^
  -DSWIG_HIDE_WARNINGS=ON ^
+ -DPYTHONOCC_MESHDS_NUMPY=ON ^
+ -DPYTHONOCC_VERSION=%OCCT_VERSION% ^
  ..
 if errorlevel 1 exit 1
 
@@ -20,8 +23,3 @@ if errorlevel 1 exit 1
 REM Install step
 ninja install
 if errorlevel 1 exit 1
-
-REM copy the source
-REM cd ..
-REM xcopy src "%LIBRARY_PREFIX%\src\pythonocc-core\src" /s /e /i
-REM if errorlevel 1 exit 1
diff --git a/ci/conda/build.sh b/ci/conda/build.sh
@@ -7,16 +7,18 @@ if [[ ${HOST} =~ .*linux.* ]]; then
 fi
 
 # Configure step
-cmake -G Ninja -DCMAKE_INSTALL_PREFIX=$PREFIX \
+cmake -G Ninja \
  -DPYTHONOCC_BUILD_TYPE=Release \
-  ${CMAKE_PLATFORM_FLAGS[@]} \
- -DPYTHONOCC_MESHDS_NUMPY=ON \
  -DCMAKE_PREFIX_PATH=$PREFIX \
+ -DCMAKE_LIBRARY_PATH:FILEPATH="$PREFIX/lib" \
+ -DCMAKE_INSTALL_PREFIX:FILEPATH=$PREFIX \
  -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
+  ${CMAKE_PLATFORM_FLAGS[@]} \
  -DPython3_FIND_STRATEGY=LOCATION \
  -DPython3_FIND_FRAMEWORK=NEVER \
  -DSWIG_HIDE_WARNINGS=ON \
- .
+ -DPYTHONOCC_MESHDS_NUMPY=ON \
+ -DPYTHONOCC_VERSION=$OCCT_VERSION \
 
 # Build step
 ninja

diff --git a/ci/conda/conda_build_config.yaml b/ci/conda/conda_build_config.yaml
@@ -1,8 +1,2 @@
 CONDA_BUILD_SYSROOT:
- - /Applications/Xcode_12.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk       # [osx]
-
-c_compiler:
- - vs2015                     # [win]
-
-cxx_compiler:
- - vs2015                     # [win]
+ - /Applications/Xcode_13.2.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.1.sdk 
diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "7.5.3" %}
+{% set version = "7.6.2" %}
 
 package:
   name: pythonocc-core
@@ -25,11 +25,11 @@ requirements:
 
   host:
     - python {{ python }}
-    - occt ==7.5.3
+    - occt ==7.6.2
     - numpy >=1.17
 
   run:
-    - occt ==7.5.3
+    - occt ==7.6.2
     - python
     - six
     - numpy >=1.17