ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 22:00:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for OCC7.1 on Windows, also support providing own OCC version by setting OCC_INCLUDE_DIR and OCC_LIBRARY_DIR

Browse Source
This commit is contained in:
Matthias 2017-02-09 12:07:09 +01:00
parent e190943f4f
commit 360e6fba86
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake_modules/SuperBuild.cmake
View File

@ -88,7 +88,7 @@ endif (USE_PYTHON)
####################################################################### #######################################################################
if(USE_OCC AND WIN32) if(USE_OCC AND WIN32 AND NOT OCC_INCLUDE_DIR)
ExternalProject_Add(win_download_occ ExternalProject_Add(win_download_occ
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/tcl PREFIX ${CMAKE_CURRENT_BINARY_DIR}/tcl
URL ${OCC_DOWNLOAD_URL_WIN} URL ${OCC_DOWNLOAD_URL_WIN}
@ -100,7 +100,7 @@ if(USE_OCC AND WIN32)
LOG_DOWNLOAD 1 LOG_DOWNLOAD 1
) )
list(APPEND NETGEN_DEPENDENCIES win_download_occ) list(APPEND NETGEN_DEPENDENCIES win_download_occ)
endif(USE_OCC AND WIN32) endif(USE_OCC AND WIN32 AND NOT OCC_INCLUDE_DIR)
####################################################################### #######################################################################
@ -132,6 +132,8 @@ set_vars( NETGEN_CMAKE_ARGS
INSTALL_DEPENDENCIES INSTALL_DEPENDENCIES
INTEL_MIC INTEL_MIC
CMAKE_PREFIX_PATH CMAKE_PREFIX_PATH
OCC_INCLUDE_DIR
OCC_LIBRARY_DIR
) )
if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles") if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")

4
libsrc/occ/Partition_Inter3d.cxx
View File

@ -702,7 +702,7 @@ TopTools_MapOfShape& Partition_Inter3d::TouchedFaces()
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(BRepAlgo_AsDes) Partition_Inter3d::AsDes() const Handle_BRepAlgo_AsDes Partition_Inter3d::AsDes() const
{ {
return myAsDes; return myAsDes;
} }
@ -829,7 +829,7 @@ TopoDS_Vertex Partition_Inter3d::ReplaceSameDomainV(const TopoDS_Vertex& V,
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(BRepAlgo_AsDes) Partition_Inter3d::SectionEdgesAD() const Handle_BRepAlgo_AsDes Partition_Inter3d::SectionEdgesAD() const
{ {
return mySectionEdgesAD; return mySectionEdgesAD;
} }