Merge pull request #1017 from DLR-SC/occ_cmake

CMake adjustments for building with OpenCascade 7.5
DLR-SC · Jul 17, 2024 · fd4cf85 · fd4cf85
2 parents 1908230 + 5d58cdf
commit fd4cf85
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/TIGLViewer/src/TIGLQAspectWindow.cpp b/TIGLViewer/src/TIGLQAspectWindow.cpp
@@ -103,7 +103,7 @@ void TIGLQAspectWindow::Unmap() const
 // function : DoResize
 // purpose  :
 // =======================================================================
-#if OCC_VERSION_HEX >= 0x070600
+#if OCC_VERSION_HEX >= 0x070500
 Aspect_TypeOfResize TIGLQAspectWindow::DoResize()
 #else
 Aspect_TypeOfResize TIGLQAspectWindow::DoResize() const

diff --git a/TIGLViewer/src/TIGLQAspectWindow.h b/TIGLViewer/src/TIGLQAspectWindow.h
@@ -73,7 +73,7 @@ class TIGLQAspectWindow : public Aspect_Window
     Aspect_Drawable NativeParentHandle() const override;
 
     //! Applies the resizing to the window <me>
-#if OCC_VERSION_HEX >= 0x070600
+#if OCC_VERSION_HEX >= 0x070500
     Aspect_TypeOfResize DoResize() override;
 #else
     Aspect_TypeOfResize DoResize() const override;

diff --git a/cmake/UseOpenCASCADE.cmake b/cmake/UseOpenCASCADE.cmake
@@ -48,9 +48,12 @@ if(OCE_FOUND)
   option(OCE_STATIC_LIBS "Should be checked, if static OCE libs are linked" OFF)
 else(OCE_FOUND)
   message("OCE not found! Searching for OpenCASCADE.")
-  find_package(OpenCASCADE CONFIG REQUIRED)
+  find_package(OpenCASCADE CONFIG REQUIRED COMPONENTS FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange)
   option(OpenCASCADE_STATIC_LIBS "Should be checked, if static OpenCASCADE libs are linked" OFF)
 
+  # PATCH OpenCASCADE_LIBRARIES for removing unnecessary libraries
+  list (REMOVE_ITEM OpenCASCADE_LIBRARIES ${OpenCASCADE_Draw_LIBRARIES})
+  list (REMOVE_ITEM OpenCASCADE_LIBRARIES ${OpenCASCADE_DETools_LIBRARIES})
   message(STATUS "Found opencascade " ${OpenCASCADE_VERSION})
 
   FIND_PATH(OpenCASCADE_SHADER_DIRECTORY