diff --git a/cmake_modules/SuperBuild.cmake b/cmake_modules/SuperBuild.cmake index de9370bb..546ded40 100644 --- a/cmake_modules/SuperBuild.cmake +++ b/cmake_modules/SuperBuild.cmake @@ -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 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/tcl URL ${OCC_DOWNLOAD_URL_WIN} @@ -100,7 +100,7 @@ if(USE_OCC AND WIN32) LOG_DOWNLOAD 1 ) 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 INTEL_MIC CMAKE_PREFIX_PATH + OCC_INCLUDE_DIR + OCC_LIBRARY_DIR ) if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles") diff --git a/libsrc/occ/Partition_Inter3d.cxx b/libsrc/occ/Partition_Inter3d.cxx index 1066871a..9fe1641a 100644 --- a/libsrc/occ/Partition_Inter3d.cxx +++ b/libsrc/occ/Partition_Inter3d.cxx @@ -702,7 +702,7 @@ TopTools_MapOfShape& Partition_Inter3d::TouchedFaces() //purpose : //======================================================================= -Handle(BRepAlgo_AsDes) Partition_Inter3d::AsDes() const +Handle_BRepAlgo_AsDes Partition_Inter3d::AsDes() const { return myAsDes; } @@ -829,7 +829,7 @@ TopoDS_Vertex Partition_Inter3d::ReplaceSameDomainV(const TopoDS_Vertex& V, //purpose : //======================================================================= -Handle(BRepAlgo_AsDes) Partition_Inter3d::SectionEdgesAD() const +Handle_BRepAlgo_AsDes Partition_Inter3d::SectionEdgesAD() const { return mySectionEdgesAD; }