Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Release notes at <https://github.com/f3d-app/f3d/releases/tag/v2.3.0>. Also fix with OpenCascade 7.8.0: See <f3d-app/f3d#1304>. PR: 277308 Approved by: yuri (maintainer)
- Loading branch information
1 parent
d0646a9
commit fea2226
Showing
5 changed files
with
432 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1704769349 | ||
SHA256 (f3d-app-f3d-v2.2.1_GH0.tar.gz) = 4d3a73b0107c8db7f0556107c74087d3748232a73981f65f7c5186ac1003ec8d | ||
SIZE (f3d-app-f3d-v2.2.1_GH0.tar.gz) = 29785716 | ||
TIMESTAMP = 1709891821 | ||
SHA256 (f3d-app-f3d-v2.3.0_GH0.tar.gz) = 9c2906b62f3066f075effbabd6501964391e8a8ffad6ed773c33db12580cc466 | ||
SIZE (f3d-app-f3d-v2.3.0_GH0.tar.gz) = 40606315 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
--- plugins/occt/CMakeLists.txt.orig 2024-01-21 15:29:01 UTC | ||
+++ plugins/occt/CMakeLists.txt | ||
@@ -17,18 +17,30 @@ endif() | ||
message(FATAL_ERROR "Plugin: OpenCASCADE: ${OpenCASCADE_VERSION} is not supported by F3D, please update your OpenCASCADE installation.") | ||
endif() | ||
|
||
-if((NOT TARGET "TKSTEP") AND (NOT TARGET "TKIGES") AND (NOT TARGET "TKMesh")) | ||
+if("${OpenCASCADE_VERSION}" VERSION_LESS "7.8.0") | ||
+ if((NOT TARGET "TKSTEP") AND (NOT TARGET "TKIGES") AND (NOT TARGET "TKMesh")) | ||
message(FATAL_ERROR "Plugin: OpenCASCADE does not contain required modules") | ||
+ endif() | ||
endif() | ||
|
||
+if((NOT TARGET "TKDESTEP") AND (NOT TARGET "TKDEIGES") AND (NOT TARGET "TKMesh")) | ||
+ message(FATAL_ERROR "Plugin: OpenCASCADE does not contain required modules") | ||
+endif() | ||
+ | ||
message(STATUS "Plugin: OpenCASCADE ${OpenCASCADE_VERSION} found") | ||
|
||
option(F3D_PLUGIN_OCCT_COLORING_SUPPORT "Enable coloring support in occt plugin" ON) | ||
mark_as_advanced(F3D_PLUGIN_OCCT_COLORING_SUPPORT) | ||
|
||
if(F3D_PLUGIN_OCCT_COLORING_SUPPORT) | ||
- if (NOT (TARGET "TKXDESTEP") OR NOT (TARGET "TKXDEIGES")) | ||
+ if("${OpenCASCADE_VERSION}" VERSION_LESS "7.8.0") | ||
+ if (NOT (TARGET "TKXDESTEP") OR NOT (TARGET "TKXDEIGES")) | ||
message(FATAL_ERROR "occt plugin: TKXDESTEP and TKXDEIGES OCCT modules are not found. Turn off F3D_PLUGIN_OCCT_COLORING_SUPPORT or enable them in your OpenCascade build.") | ||
+ endif() | ||
+ else() | ||
+ if (NOT (TARGET "TKXSDRAWSTEP") OR NOT (TARGET "TKXSDRAWIGES")) | ||
+ message(FATAL_ERROR "occt plugin: TKXSDRAWSTEP and TKXSDRAWIGES OCCT modules are not found. Turn off F3D_PLUGIN_OCCT_COLORING_SUPPORT or enable them in your OpenCascade build.") | ||
+ endif() | ||
endif() | ||
endif() | ||
|
Oops, something went wrong.