From 023bfb8bbbd62303c64ba266563d9eda2f81469a Mon Sep 17 00:00:00 2001 From: blobfish Date: Thu, 19 Dec 2019 10:16:09 -0500 Subject: [PATCH 1/2] Plugins: Cmake: OpenCasCade: Changing header used for include directory search. See Following. BRepMesh.hxx is gone in occt 7.4. Now searching for Standard_Version.hxx, which should be more consistent. --- CMakeModules/FindOpenCascade.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/FindOpenCascade.cmake b/CMakeModules/FindOpenCascade.cmake index 5df1c0cf2..ade975da5 100644 --- a/CMakeModules/FindOpenCascade.cmake +++ b/CMakeModules/FindOpenCascade.cmake @@ -8,7 +8,7 @@ # correspond to the ./configure --prefix=$OPENCASCADE_DIR # used in building OPENCASCADE. -FIND_PATH(OPENCASCADE_INCLUDE_DIR BRepMesh.hxx +FIND_PATH(OPENCASCADE_INCLUDE_DIR Standard_Version.hxx PATHS ${OPENCASCADE_DIR} $ENV{OPENCASCADE_DIR} From cd5740e98f3b0e29abf0779935daafe209f3d98b Mon Sep 17 00:00:00 2001 From: blobfish Date: Thu, 19 Dec 2019 11:46:05 -0500 Subject: [PATCH 2/2] Plugins: OpenCasCade: Adding 'std' prefix where needed. See Following. Prior to 7.4, occt had a 'using namespace std' in a header file that was polluting dependent projects. They have since fixed it and so these changes are required. --- src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp b/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp index 383ef31bd..bca1c0ecc 100644 --- a/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp +++ b/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp @@ -292,7 +292,7 @@ osg::ref_ptr ReaderWritterOpenCASCADE::OCCTKReader::igesToOSGGeode(c /// transfer data from reader to doc if(!reader.Transfer(doc)) { - cout << "Cannot read any relevant data from the STEP file" << endl; + std::cout << "Cannot read any relevant data from the STEP file" << std::endl; return NULL; } } @@ -309,7 +309,7 @@ osg::ref_ptr ReaderWritterOpenCASCADE::OCCTKReader::igesToOSGGeode(c /// transfer data from reader to doc if(!reader.Transfer(doc)) { - cout << "Cannot read any relevant data from the IGES file" << endl; + std::cout << "Cannot read any relevant data from the IGES file" << std::endl; return NULL; } } @@ -327,7 +327,7 @@ osg::ref_ptr ReaderWritterOpenCASCADE::OCCTKReader::igesToOSGGeode(c if(freeShapes.Length() == 0) { - std::cout << "No Shapes found" << endl; + std::cout << "No Shapes found" << std::endl; return NULL; } else