Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Nektar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Leilei Ji
Nektar
Commits
8db63eec
Commit
8db63eec
authored
10 months ago
by
Dave Moxey
Browse files
Options
Downloads
Patches
Plain Diff
Fix OpenCASCADE 7.8.0 compilation issues
parent
9f4bedba
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
cmake/FindOCC.cmake
+18
-6
18 additions, 6 deletions
cmake/FindOCC.cmake
cmake/ThirdPartyOCE.cmake
+16
-7
16 additions, 7 deletions
cmake/ThirdPartyOCE.cmake
with
35 additions
and
13 deletions
CHANGELOG.md
+
1
−
0
View file @
8db63eec
...
...
@@ -16,6 +16,7 @@ v5.6.0
-
Use FwdTrans in UnsteadySystem when using Parareal (!1785)
-
Automate deployment of README.md to dockerhub (!1786)
-
Fix memory leak with Block preconditioner for time-updated matrices (!1737)
-
Fix compilation issue with OpenCASCADE 7.8.0 (!1799)
**CompressibleFlowSolver**
-
Complete second Frechet derivative implementation (!1761)
...
...
This diff is collapsed.
Click to expand it.
cmake/FindOCC.cmake
+
18
−
6
View file @
8db63eec
...
...
@@ -35,20 +35,28 @@ FIND_PACKAGE(OCE 0.17 QUIET)
SET
(
OCC_FOUND FALSE
)
IF
(
OCE_FOUND AND OCE_ALL_FOUND
)
MESSAGE
(
STATUS
"OpenCASCADE Community Edition has been found with all required components."
)
IF
(
NOT FIND_OCC_QUIET
)
MESSAGE
(
STATUS
"OpenCASCADE Community Edition has been found with all required components."
)
ENDIF
()
SET
(
OCC_INCLUDE_DIR
${
OCE_INCLUDE_DIRS
}
)
SET
(
OCC_FOUND TRUE
)
ELSE
(
OCE_FOUND AND OCE_ALL_FOUND
)
#look for OpenCASCADE
MESSAGE
(
STATUS
"OpenCASCADE Community Edition could not be found or has missing components."
)
IF
(
NOT FIND_OCC_QUIET
)
MESSAGE
(
STATUS
"OpenCASCADE Community Edition could not be found or has missing components."
)
ENDIF
()
SET
(
OpenCASCADE_FIND_COMPONENTS
${
OCE_FIND_COMPONENTS
}
)
FIND_PACKAGE
(
OpenCASCADE
)
IF
(
OpenCASCADE_FOUND
)
MESSAGE
(
STATUS
"OpenCASCADE has been found with all required components."
)
IF
(
NOT FIND_OCC_QUIET
)
MESSAGE
(
STATUS
"OpenCASCADE has been found with all required components."
)
ENDIF
()
SET
(
OCC_INCLUDE_DIR
${
OpenCASCADE_INCLUDE_DIR
}
)
SET
(
OCC_FOUND TRUE
)
ELSE
()
MESSAGE
(
STATUS
"OpenCASCADE could not be found or has missing components."
)
IF
(
NOT FIND_OCC_QUIET
)
MESSAGE
(
STATUS
"OpenCASCADE could not be found or has missing components."
)
ENDIF
()
ENDIF
()
ENDIF
(
OCE_FOUND AND OCE_ALL_FOUND
)
...
...
@@ -67,10 +75,14 @@ IF(OCC_FOUND)
SET
(
OCC_VERSION_STRING
"
${
OCC_MAJOR
}
.
${
OCC_MINOR
}
.
${
OCC_MAINT
}
"
)
IF
(
OCC_VERSION_STRING VERSION_LESS 6.8
)
MESSAGE
(
STATUS
"OCC version too low, will build from source"
)
IF
(
NOT FIND_OCC_QUIET
)
MESSAGE
(
STATUS
"OCC version too low, will build from source"
)
ENDIF
()
SET
(
OCC_FOUND FALSE
)
ELSE
()
MESSAGE
(
STATUS
"-- Found OCE/OpenCASCADE with OCC version:
${
OCC_VERSION_STRING
}
"
)
IF
(
NOT FIND_OCC_QUIET
)
MESSAGE
(
STATUS
"-- Found OCE/OpenCASCADE with OCC version:
${
OCC_VERSION_STRING
}
"
)
ENDIF
()
SET
(
OCC_LIBRARIES
${
OCE_FIND_COMPONENTS
}
)
ENDIF
()
ENDIF
(
OCC_FOUND
)
This diff is collapsed.
Click to expand it.
cmake/ThirdPartyOCE.cmake
+
16
−
7
View file @
8db63eec
...
...
@@ -15,8 +15,6 @@ IF(NEKTAR_USE_MESHGEN)
TKG2d
TKG3d
TKMath
TKIGES
TKSTL
TKShHealing
TKXSBase
TKBool
...
...
@@ -27,21 +25,32 @@ IF(NEKTAR_USE_MESHGEN)
TKGeomBase
TKOffset
TKPrim
TKSTEP
TKSTEPBase
TKSTEPAttr
TKHLR
TKFeat
TKXCAF
TKLCAF
TKXDESTEP
)
)
# Try to find installed version of OpenCascade
SET
(
FIND_OCC_QUIET ON
)
INCLUDE
(
FindOCC
)
# Determine which version of OpenCASCADE we're building against. 7.8.0
# renames some of the libraries and we therefore need to re-run detection
# with the correct packages.
IF
(
OCC_FOUND
)
# We definitiely don't need to build OCE in this case.
SET
(
BUILD_OCE OFF
)
IF
(
OCC_VERSION_STRING VERSION_LESS 7.8.0
)
LIST
(
APPEND OCC_LIB_LIST TKIGES TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKXDESTEP TKSTL TKSTEPAttr
)
ELSE
()
LIST
(
APPEND OCC_LIB_LIST TKDESTEP TKDEIGES TKDESTL
)
ENDIF
()
# Re-run to find additional components for STEP.
SET
(
FIND_OCC_QUIET OFF
)
INCLUDE
(
FindOCC
)
ELSE
()
SET
(
BUILD_OCE ON
)
ENDIF
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment