Skip to content

Upgrade to OCCT 7.9.0. #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
oursland wants to merge 2 commits into from
Closed

Upgrade to OCCT 7.9.0. #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b33021e
Upgrade to OCCT 7.9.0.
oursland May 14, 2025
afca2b8
MNT: Re-rendered with conda-build 25.4.2, conda-smithy 3.48.1, and co…
oursland May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libboost_devel:
- '1.86'
occt:
- 7.8.1
- 7.9.0
target_platform:
- linux-64
vtk:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libboost_devel:
- '1.86'
occt:
- 7.8.1
- 7.9.0
target_platform:
- linux-aarch64
vtk:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libboost_devel:
- '1.86'
occt:
- 7.8.1
- 7.9.0
target_platform:
- linux-ppc64le
vtk:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ libboost_devel:
macos_machine:
- x86_64-apple-darwin13.4.0
occt:
- 7.8.1
- 7.9.0
target_platform:
- osx-64
vtk:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ libboost_devel:
macos_machine:
- arm64-apple-darwin20.0.0
occt:
- 7.8.1
- 7.9.0
target_platform:
- osx-arm64
vtk:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ cxx_compiler:
libboost_devel:
- '1.86'
occt:
- 7.8.1
- 7.9.0
target_platform:
- win-64
tbb_devel:
- '2021'
- '2022'
vtk:
- 9.3.1
zlib:
Expand Down
2 changes: 1 addition & 1 deletion .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ c_compiler: # [win]
- vs2022 # [win]
cxx_compiler: # [win]
- vs2022 # [win]
occt:
- 7.9.0
tbb_devel: # [win]
- 2022 # [win]
5 changes: 3 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "smesh" %}
{% set version = "9.9.0.0" %}
{% set build_number = 14 %}
{% set build_number = 15 %}
{% set build_number = build_number + 500 %} # [FEATURE_DEBUG]

package:
Expand All @@ -13,6 +13,7 @@ source:
sha256: 876390cf80a3918199949a574b5e091dd705e3e425d2323903989639450bb07a
patches:
- patches/pthread.diff # [win]
- patches/occt-7.9.0.diff

build:
number: {{ build_number }}
Expand Down Expand Up @@ -53,7 +54,7 @@ test:
- {{ cdt('libxxf86vm') }} # [linux]
- cmake
- ninja
- catch2 < 3.0
- catch2 <3.0
- libboost-devel
- winpthreads-devel # [win]
- tbb-devel # [win]
Expand Down
13 changes: 13 additions & 0 deletions recipe/patches/occt-7.9.0.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/SMESH/CMakeLists.txt b/src/SMESH/CMakeLists.txt
index 65a806d..b061715 100644
--- a/src/SMESH/CMakeLists.txt
+++ b/src/SMESH/CMakeLists.txt
@@ -157,7 +157,7 @@ install(FILES ${SMESHDS_INCLUDES} DESTINATION "include/smesh/SMESHDS")
# StdMeshers
file(GLOB StdMeshers_SRC ${SMESH_SRC_DIR}/StdMeshers/*.cxx)
add_library(StdMeshers ${StdMeshers_SRC})
-target_link_libraries(StdMeshers SMESH MEFISTO2 TKOffset ${Boost_LIBRARIES})
+target_link_libraries(StdMeshers SMESH MEFISTO2 TKExpress TKOffset ${Boost_LIBRARIES})
target_include_directories(StdMeshers PUBLIC
$<BUILD_INTERFACE:${SMESH_SRC_DIR}/StdMeshers>
$<INSTALL_INTERFACE:include/smesh/StdMeshers>