From: jfa Date: Fri, 22 Nov 2024 12:21:49 +0000 (+0000) Subject: Refactor code. Support CommonGeomLib by cmake. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e430bf60401fb2b8c68c9aee9ee187827a7c7bfd;p=modules%2Fgeom.git Refactor code. Support CommonGeomLib by cmake. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index cee851a22..47c7d2abc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,6 +140,13 @@ ENDIF(SALOME_BUILD_GUI) FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) +SET(CommonGeomLib_ROOT_DIR $ENV{CommonGeomLib_ROOT_DIR} CACHE PATH "Path to the CommonGeomLib tool") +IF(EXISTS ${CommonGeomLib_ROOT_DIR}) + FIND_PACKAGE(SalomeCommonGeomLib REQUIRED) +ELSE(EXISTS ${CommonGeomLib_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need the CommonGeomLib tool, please define CommonGeomLib_ROOT_DIR !") +ENDIF(EXISTS ${CommonGeomLib_ROOT_DIR}) + IF(SALOME_GEOM_USE_VTK) FIND_PACKAGE(SalomeVTK REQUIRED) ADD_DEFINITIONS(-DWITH_VTK) @@ -279,19 +286,21 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}") SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}") SET(OPENCASCADE_ROOT_DIR "${OPENCASCADE_ROOT_DIR}") +SET(CommonGeomLib_ROOT_DIR "${CommonGeomLib_ROOT_DIR}") SET(VTK_ROOT_DIR "${VTK_ROOT_DIR}") SET(OPENCV_ROOT_DIR "${OPENCV_ROOT_DIR}") SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") # Build variables that will be expanded when configuring SalomeConfig.cmake: -SALOME_CONFIGURE_PREPARE(OpenCV OpenCASCADE VTK) +SALOME_CONFIGURE_PREPARE(OpenCV OpenCASCADE CommonGeomLib VTK) CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX - KERNEL_ROOT_DIR GUI_ROOT_DIR OPENCASCADE_ROOT_DIR VTK_ROOT_DIR OPENCV_ROOT_DIR) + KERNEL_ROOT_DIR GUI_ROOT_DIR OPENCASCADE_ROOT_DIR CommonGeomLib_ROOT_DIR + VTK_ROOT_DIR OPENCV_ROOT_DIR) # - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?): # Get the relative path of the include directory so diff --git a/src/AdvancedEngine/CMakeLists.txt b/src/AdvancedEngine/CMakeLists.txt index 156ed2fec..15a41a701 100644 --- a/src/AdvancedEngine/CMakeLists.txt +++ b/src/AdvancedEngine/CMakeLists.txt @@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} + ${CommonGeomLib_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/GEOMImpl ${PROJECT_SOURCE_DIR}/src/GEOM ${PROJECT_SOURCE_DIR}/src/GEOMAlgo diff --git a/src/BREPPlugin/CMakeLists.txt b/src/BREPPlugin/CMakeLists.txt index 385c9dcae..245454486 100644 --- a/src/BREPPlugin/CMakeLists.txt +++ b/src/BREPPlugin/CMakeLists.txt @@ -26,6 +26,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( ${OpenCASCADE_INCLUDE_DIR} + ${CommonGeomLib_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo diff --git a/src/GEOMImpl/CMakeLists.txt b/src/GEOMImpl/CMakeLists.txt index 1f24e459a..1cf8478d3 100644 --- a/src/GEOMImpl/CMakeLists.txt +++ b/src/GEOMImpl/CMakeLists.txt @@ -17,27 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -## FIXME -SET(COMMONGEOMLIB_ROOT_DIR "/hdd2/S2/SALOME-MBS-DB11/INSTALL/CommonGeomLib") -## -message(STATUS "COMMONGEOMLIB_ROOT_DIR: ${COMMONGEOMLIB_ROOT_DIR}") -SET(COMMONGEOMLIB_INCLUDE_DIR "${COMMONGEOMLIB_ROOT_DIR}/${SALOME_INSTALL_HEADERS}") -SET(COMMONGEOMLIB_LIBRARY_DIR "${COMMONGEOMLIB_ROOT_DIR}/${SALOME_INSTALL_LIBS}") -SET(COMMOMGEOMLIB_LIBRARIES GeomAnaTool) -message(STATUS "COMMONGEOMLIB_INCLUDE_DIR: ${COMMONGEOMLIB_INCLUDE_DIR}") -message(STATUS "COMMONGEOMLIB_LIBRARY_DIR: ${COMMONGEOMLIB_LIBRARY_DIR}") -message(STATUS "COMMOMGEOMLIB_LIBRARIES: ${COMMOMGEOMLIB_LIBRARIES}") - # --- options --- # additional include directories INCLUDE_DIRECTORIES( ${OpenCASCADE_INCLUDE_DIR} + ${CommonGeomLib_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} - ${COMMONGEOMLIB_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/src/ShHealOper ${PROJECT_SOURCE_DIR}/src/GEOM ${PROJECT_SOURCE_DIR}/src/BlockFix @@ -57,16 +46,8 @@ ADD_DEFINITIONS( ) # libraries to link to -message(STATUS "----------------------------------------") -message(STATUS "COMMONGEOMLIB_LIBRARIES: ${COMMOMGEOMLIB_LIBRARIES}") -message(STATUS "OpenCASCADE_ModelingAlgorithms_LIBRARIES: ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}") -message(STATUS "PYTHON_LIBRARIES: ${PYTHON_LIBRARIES}") -message(STATUS "KERNEL_SALOMELocalTrace: ${KERNEL_SALOMELocalTrace}") -message(STATUS "----------------------------------------") SET(_link_LIBRARIES - ##FIXME: - ## The following line works only for Linux, not for Windows - ${COMMONGEOMLIB_LIBRARY_DIR}/libGeomAnaTool.so + ${CommonGeomLib_GeomAnaTool} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${PYTHON_LIBRARIES} ShHealOper GEOMbasic BlockFix GEOMAlgo GEOMUtils GEOMSketcher GEOMArchimede XAO diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index 2e8274b20..101eccb4f 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -1467,7 +1467,7 @@ void GEOMImpl_IMeasureOperations::GetTolerance //============================================================================= bool GEOMImpl_IMeasureOperations::CheckShape (Handle(GEOM_Object) theShape, const Standard_Boolean theIsCheckGeom, - std::list &theErrors) + std::list &theErrors) { SetErrorCode(KO); theErrors.clear(); @@ -1491,7 +1491,7 @@ bool GEOMImpl_IMeasureOperations::CheckShape (Handle(GEOM_Object) theShape, if (ana.IsValid()) { isValid = true; } else { - FillErrors(ana, aShape, theErrors); + GeomAnaTool::FillErrors(ana, aShape, theErrors); } } catch (Standard_Failure& aFail) { @@ -1510,7 +1510,7 @@ bool GEOMImpl_IMeasureOperations::CheckShape (Handle(GEOM_Object) theShape, //============================================================================= TCollection_AsciiString GEOMImpl_IMeasureOperations::PrintShapeErrors (Handle(GEOM_Object) theShape, - const std::list &theErrors) + const std::list &theErrors) { TCollection_AsciiString aDump; @@ -1534,7 +1534,7 @@ TCollection_AsciiString GEOMImpl_IMeasureOperations::PrintShapeErrors if (!theErrors.empty()) { // The shape is not valid. Prepare errors for dump. TopTools_IndexedMapOfShape anIndices; - std::list::const_iterator anIter = theErrors.begin(); + std::list::const_iterator anIter = theErrors.begin(); Standard_Integer nbv, nbe, nbw, nbf, nbs, nbo; nbv = nbe = nbw = nbf = nbs = nbo = 0; @@ -1734,7 +1734,7 @@ bool GEOMImpl_IMeasureOperations::ExtractBOPFailure const bool theRunParallel, const bool theDoExact, Handle(GEOM_Object)& theResultShape, - std::list& theErrors) + std::list& theErrors) { SetErrorCode(KO); theErrors.clear(); @@ -1799,11 +1799,11 @@ bool GEOMImpl_IMeasureOperations::ExtractBOPFailure std::cout << "--- The operation has failures ---" << std::endl; //aResult = aTool.Failures(); //std::cout << "#Failures = " << aResult.Extent() << std::endl; - const std::list& errors = aTool.ShapeErrors(); + const std::list& errors = aTool.ShapeErrors(); std::cout << "#Failures = " << errors.size() << std::endl; - for (std::list::const_iterator it = errors.begin(); it != errors.end(); ++it) + for (std::list::const_iterator it = errors.begin(); it != errors.end(); ++it) { - ShapeError aError; + GeomAnaTool::ShapeError aError; aError.error = it->error; aError.incriminated = it->incriminated; theErrors.push_back(aError); @@ -3664,161 +3664,6 @@ double GEOMImpl_IMeasureOperations::ComputeTolerance(Handle(GEOM_Object) theEdge return aMaxDist; } -//======================================================================= -//function : FillErrorsSub -//purpose : Fill the errors list of subshapes on shape. -//======================================================================= -void GEOMImpl_IMeasureOperations::FillErrorsSub - (const BRepCheck_Analyzer &theAna, - const TopoDS_Shape &theShape, - const TopAbs_ShapeEnum theSubType, - TopTools_DataMapOfIntegerListOfShape &theMapErrors) const -{ - TopExp_Explorer anExp(theShape, theSubType); - TopTools_MapOfShape aMapSubShapes; - - for (; anExp.More(); anExp.Next()) { - const TopoDS_Shape &aSubShape = anExp.Current(); - - if (aMapSubShapes.Add(aSubShape)) { - const Handle(BRepCheck_Result) &aRes = theAna.Result(aSubShape); - - for (aRes->InitContextIterator(); - aRes->MoreShapeInContext(); - aRes->NextShapeInContext()) { - if (aRes->ContextualShape().IsSame(theShape)) { - BRepCheck_ListIteratorOfListOfStatus itl(aRes->StatusOnShape()); - - if (itl.Value() != BRepCheck_NoError) { - // Add all errors for theShape and its sub-shape. - for (;itl.More(); itl.Next()) { - const Standard_Integer aStat = (Standard_Integer)itl.Value(); - - if (!theMapErrors.IsBound(aStat)) { - TopTools_ListOfShape anEmpty; - - theMapErrors.Bind(aStat, anEmpty); - } - - TopTools_ListOfShape &theShapes = theMapErrors.ChangeFind(aStat); - - theShapes.Append(aSubShape); - theShapes.Append(theShape); - } - } - } - - break; - } - } - } -} - -//======================================================================= -//function : FillErrors -//purpose : Fill the errors list. -//======================================================================= -void GEOMImpl_IMeasureOperations::FillErrors - (const BRepCheck_Analyzer &theAna, - const TopoDS_Shape &theShape, - TopTools_DataMapOfIntegerListOfShape &theMapErrors, - TopTools_MapOfShape &theMapShapes) const -{ - if (theMapShapes.Add(theShape)) { - // Fill errors of child shapes. - for (TopoDS_Iterator iter(theShape); iter.More(); iter.Next()) { - FillErrors(theAna, iter.Value(), theMapErrors, theMapShapes); - } - - // Fill errors of theShape. - const Handle(BRepCheck_Result) &aRes = theAna.Result(theShape); - - if (!aRes.IsNull()) { - BRepCheck_ListIteratorOfListOfStatus itl(aRes->Status()); - - if (itl.Value() != BRepCheck_NoError) { - // Add all errors for theShape. - for (;itl.More(); itl.Next()) { - const Standard_Integer aStat = (Standard_Integer)itl.Value(); - - if (!theMapErrors.IsBound(aStat)) { - TopTools_ListOfShape anEmpty; - - theMapErrors.Bind(aStat, anEmpty); - } - - theMapErrors.ChangeFind(aStat).Append(theShape); - } - } - } - - // Add errors of subshapes on theShape. - const TopAbs_ShapeEnum aType = theShape.ShapeType(); - - switch (aType) { - case TopAbs_EDGE: - FillErrorsSub(theAna, theShape, TopAbs_VERTEX, theMapErrors); - break; - case TopAbs_FACE: - FillErrorsSub(theAna, theShape, TopAbs_WIRE, theMapErrors); - FillErrorsSub(theAna, theShape, TopAbs_EDGE, theMapErrors); - FillErrorsSub(theAna, theShape, TopAbs_VERTEX, theMapErrors); - break; - case TopAbs_SOLID: - FillErrorsSub(theAna, theShape, TopAbs_SHELL, theMapErrors); - break; - default: - break; - } - } -} - -//======================================================================= -//function : FillErrors -//purpose : Fill the errors list. -//======================================================================= -void GEOMImpl_IMeasureOperations::FillErrors - (const BRepCheck_Analyzer &theAna, - const TopoDS_Shape &theShape, - std::list &theErrors) const -{ - // Fill the errors map. - TopTools_DataMapOfIntegerListOfShape aMapErrors; - TopTools_MapOfShape aMapShapes; - - FillErrors(theAna, theShape, aMapErrors, aMapShapes); - - // Map sub-shapes and their indices - TopTools_IndexedMapOfShape anIndices; - - TopExp::MapShapes(theShape, anIndices); - - TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape aMapIter(aMapErrors); - - for (; aMapIter.More(); aMapIter.Next()) { - ShapeError anError; - - anError.error = (BRepCheck_Status)aMapIter.Key(); - - TopTools_ListIteratorOfListOfShape aListIter(aMapIter.Value()); - TopTools_MapOfShape aMapUnique; - - for (; aListIter.More(); aListIter.Next()) { - const TopoDS_Shape &aShape = aListIter.Value(); - - if (aMapUnique.Add(aShape)) { - const Standard_Integer anIndex = anIndices.FindIndex(aShape); - - anError.incriminated.push_back(anIndex); - } - } - - if (!anError.incriminated.empty()) { - theErrors.push_back(anError); - } - } -} - //======================================================================= //function : ShapeProximityCalculator //purpose : returns an object to compute the proximity value diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx index d6eea1e27..65ca7bf49 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx @@ -25,6 +25,8 @@ #include "GEOM_IOperations.hxx" +#include + #include #include #include @@ -149,18 +151,13 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations { Standard_Real& EdgeMin, Standard_Real& EdgeMax, Standard_Real& VertMin, Standard_Real& VertMax); - struct ShapeError { - BRepCheck_Status error; - std::list incriminated; - }; - Standard_EXPORT bool CheckShape (Handle(GEOM_Object) theShape, const Standard_Boolean theIsCheckGeom, - std::list &theErrors); + std::list &theErrors); Standard_EXPORT TCollection_AsciiString PrintShapeErrors (Handle(GEOM_Object) theShape, - const std::list &theErrors); + const std::list &theErrors); Standard_EXPORT bool ExtractBOPFailure (const Handle(TColStd_HSequenceOfTransient)& theShapes, @@ -170,7 +167,7 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations { const bool theRunParallel, const bool theDoExact, Handle(GEOM_Object)& theResultShape, - std::list& theErrors); + std::list& theErrors); Standard_EXPORT bool CheckSelfIntersections (Handle(GEOM_Object) theShape, const SICheckLevel theCheckLevel, @@ -281,21 +278,6 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations { private: - void FillErrorsSub - (const BRepCheck_Analyzer &theAna, - const TopoDS_Shape &theShape, - const TopAbs_ShapeEnum theSubType, - TopTools_DataMapOfIntegerListOfShape &theMapErrors) const; - void FillErrors - (const BRepCheck_Analyzer &theAna, - const TopoDS_Shape &theShape, - TopTools_DataMapOfIntegerListOfShape &theMapErrors, - TopTools_MapOfShape &theMapShapes) const; - - void FillErrors (const BRepCheck_Analyzer &theAna, - const TopoDS_Shape &theShape, - std::list &theErrors) const; - Standard_Real getSurfaceCurvatures (const Handle(Geom_Surface)& aSurf, Standard_Real theUParam, Standard_Real theVParam, diff --git a/src/GEOM_I/CMakeLists.txt b/src/GEOM_I/CMakeLists.txt index 9cdacc9b6..9afdc0497 100644 --- a/src/GEOM_I/CMakeLists.txt +++ b/src/GEOM_I/CMakeLists.txt @@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} + ${CommonGeomLib_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/GEOMImpl ${PROJECT_SOURCE_DIR}/src/GEOM ${PROJECT_SOURCE_DIR}/src/GEOMAlgo @@ -47,6 +48,7 @@ ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES + ${CommonGeomLib_GeomAnaTool} GEOMImpl GEOMUtils SalomeIDLGEOM diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index 1eedcf699..9020ba7be 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc @@ -43,7 +43,7 @@ */ static void ConvertShapeError (const GEOM::GEOM_IMeasureOperations::ShapeErrors &theErrorsFrom, - std::list &theErrorsTo) + std::list &theErrorsTo) { int aNbErr = theErrorsFrom.length(); int i = 0; @@ -52,7 +52,7 @@ static void ConvertShapeError const GEOM::GEOM_IMeasureOperations::ShapeError anErr = theErrorsFrom[i]; const GEOM::GEOM_IMeasureOperations::ShapeErrorType aType = anErr.error; const GEOM::ListOfLong anIncrims = anErr.incriminated; - GEOMImpl_IMeasureOperations::ShapeError anErrStruct; + GeomAnaTool::ShapeError anErrStruct; switch (aType) { case GEOM::GEOM_IMeasureOperations::InvalidPointOnCurve: @@ -177,7 +177,7 @@ static void ConvertShapeError * \param theErrorsTo result errors. */ static void ConvertShapeError - (const std::list &theErrorsFrom, + (const std::list &theErrorsFrom, GEOM::GEOM_IMeasureOperations::ShapeErrors_out &theErrorsTo) { const int aNbErr = theErrorsFrom.size(); @@ -187,7 +187,7 @@ static void ConvertShapeError anErrArray->length(aNbErr); // fill the local CORBA array with values from lists - std::list::const_iterator + std::list::const_iterator anIt = theErrorsFrom.begin(); int i = 0; @@ -645,7 +645,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShape return 0; } - std::list anErrList; + std::list anErrList; bool isOk = GetOperations()->CheckShape(aShape, false, anErrList); ConvertShapeError(anErrList, theErrors); @@ -673,7 +673,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShapeWithGeometry return 0; } - std::list anErrList; + std::list anErrList; bool isOk = GetOperations()->CheckShape(aShape, true, anErrList); ConvertShapeError(anErrList, theErrors); @@ -700,7 +700,7 @@ char* GEOM_IMeasureOperations_i::PrintShapeErrors } // Convert the errors sequence - std::list anErrList; + std::list anErrList; ConvertShapeError(theErrors, anErrList); @@ -757,7 +757,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::ExtractBOPFailure // Perform partition operation and check for failures Handle(::GEOM_Object) aResultShape; - std::list anErrList; + std::list anErrList; bool isOk = GetOperations()->ExtractBOPFailure (aSeqShapes, theUseTimer, theTopoOnly, theShortReport, theRunParallel, theDoExact, diff --git a/src/IGESPlugin/CMakeLists.txt b/src/IGESPlugin/CMakeLists.txt index eb9cdb048..16f24d72f 100644 --- a/src/IGESPlugin/CMakeLists.txt +++ b/src/IGESPlugin/CMakeLists.txt @@ -26,6 +26,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( ${OpenCASCADE_INCLUDE_DIR} + ${CommonGeomLib_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo diff --git a/src/STEPPlugin/CMakeLists.txt b/src/STEPPlugin/CMakeLists.txt index d00029a35..b30d761a3 100644 --- a/src/STEPPlugin/CMakeLists.txt +++ b/src/STEPPlugin/CMakeLists.txt @@ -26,6 +26,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( ${OpenCASCADE_INCLUDE_DIR} + ${CommonGeomLib_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo diff --git a/src/STLPlugin/CMakeLists.txt b/src/STLPlugin/CMakeLists.txt index 153ee83ad..63d08d0b9 100644 --- a/src/STLPlugin/CMakeLists.txt +++ b/src/STLPlugin/CMakeLists.txt @@ -26,6 +26,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( ${OpenCASCADE_INCLUDE_DIR} + ${CommonGeomLib_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo diff --git a/src/VTKPlugin/CMakeLists.txt b/src/VTKPlugin/CMakeLists.txt index baeaf1342..7437a355b 100644 --- a/src/VTKPlugin/CMakeLists.txt +++ b/src/VTKPlugin/CMakeLists.txt @@ -26,6 +26,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( ${OpenCASCADE_INCLUDE_DIR} + ${CommonGeomLib_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo diff --git a/src/XAOPlugin/CMakeLists.txt b/src/XAOPlugin/CMakeLists.txt index 843637406..62571cb00 100644 --- a/src/XAOPlugin/CMakeLists.txt +++ b/src/XAOPlugin/CMakeLists.txt @@ -26,6 +26,7 @@ ENDIF() # additional include directories INCLUDE_DIRECTORIES( ${OpenCASCADE_INCLUDE_DIR} + ${CommonGeomLib_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/GEOMAlgo