Merge pull request #550 from mmuetzel/ci-macos-2

Build ElmerGUI with OpenCascade and enabled MATC in CI on macOS.
ElmerCSC · Sep 1, 2024 · 3f8bf18 · 3f8bf18
2 parents 681cf81 + 1d58cda
commit 3f8bf18
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 44 deletions.
diff --git a/.github/workflows/build-macos-homebrew.yaml b/.github/workflows/build-macos-homebrew.yaml
@@ -42,7 +42,7 @@ jobs:
           brew reinstall gcc
           brew install \
             cmake libomp openblas open-mpi \
-            qwt vtk
+            qwt vtk opencascade
           echo "HOMEBREW_PREFIX=$(brew --prefix)" >> $GITHUB_ENV
 
       - name: configure
@@ -72,6 +72,8 @@ jobs:
             -DWITH_QT6=ON \
             -DQWT_INCLUDE_DIR="${HOMEBREW_PREFIX}/opt/qwt/lib/qwt.framework/Headers" \
             -DWITH_VTK=ON \
+            -DWITH_OCC=ON \
+            -DWITH_MATC=ON \
             -DWITH_PARAVIEW=ON \
             -DCREATE_PKGCONFIG_FILE=ON \
             ..

diff --git a/ElmerGUI/CMakeLists.txt b/ElmerGUI/CMakeLists.txt
@@ -105,10 +105,6 @@ ENDIF()
 
 IF(WITH_OCC)
 
-  if(APPLE)
-    include_directories(/usr/local/Cellar/opencascade/7.4.0_1/include/opencascade/)
-  endif()
-
   IF(NOT WITH_VTK)
     SET(WITHOUT_VTKPOST TRUE)
   ENDIF()
@@ -120,7 +116,16 @@ IF(WITH_OCC)
     MESSAGE(STATUS "  [ElmerGUI] OpenCASCADE:               " ${OpenCASCADE_FOUND})
     MESSAGE(STATUS "  [ElmerGUI] OpenCASCADE_VERSION:       " ${OpenCASCADE_VERSION})
     MESSAGE(STATUS "  [ElmerGUI] OpenCASCADE_INCLUDE_DIR:   " ${OpenCASCADE_INCLUDE_DIR})
-    SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
+    # only link to available libraries
+    SET(ELMER_USED_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase")
+    SET(ELMER_AVAILABLE_OCC_LIBS "")
+    FOREACH(_lib IN LISTS ELMER_USED_OCC_LIBS)
+      LIST(FIND OpenCASCADE_LIBRARIES ${_lib} _index)
+      IF(NOT ${_index} EQUAL -1)
+        LIST(APPEND ELMER_AVAILABLE_OCC_LIBS ${_lib})
+      ENDIF()
+    ENDFOREACH()
+    SET(ELMER_OCC_LIBS "${ELMER_AVAILABLE_OCC_LIBS}" CACHE INTERNAL "")
     MESSAGE(STATUS "  [ElmerGUI] ELMER_OCC_LIBS:    " "${ELMER_OCC_LIBS}")
     MESSAGE(STATUS "------------------------------------------------")
   ELSE()

diff --git a/ElmerGUI/cmake/Modules/FindOpenCasCade.cmake b/ElmerGUI/cmake/Modules/FindOpenCasCade.cmake
@@ -115,44 +115,48 @@ include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OCC REQUIRED_VARS OCC_INCLUDE_DIR VERSION_VAR OCC_VERSION_STRING)
 
 if(OCC_FOUND)
-  set(OCC_LIBRARIES
-    TKFillet
-    TKMesh
-    TKernel
-    TKG2d
-    TKG3d
-    TKMath
-    TKIGES
-    TKSTL
-    TKShHealing
-    TKXSBase
-    TKBin
-    TKBool
-    TKBO
-    TKCDF
-    TKBRep
-    TKTopAlgo
-    TKGeomAlgo
-    TKGeomBase
-    TKOffset
-    TKPrim
-    TKSTEP
-    TKSTEPBase
-    TKSTEPAttr
-    TKHLR
-    TKFeat
-  )
-  set(OCC_OCAF_LIBRARIES
-    TKCAF
-    TKXCAF
-    TKLCAF
-    TKXDESTEP
-    TKXDEIGES
-    TKMeshVS
-  )
-  if(OCC_VERSION_STRING VERSION_LESS 6.7.3)
-    list(APPEND OCC_OCAF_LIBRARIES TKAdvTools)
-  endif(OCC_VERSION_STRING VERSION_LESS 6.7.3)
+  if(NOT DEFINED OCC_LIBRARIES)
+    set(OCC_LIBRARIES
+      TKFillet
+      TKMesh
+      TKernel
+      TKG2d
+      TKG3d
+      TKMath
+      TKIGES
+      TKSTL
+      TKShHealing
+      TKXSBase
+      TKBin
+      TKBool
+      TKBO
+      TKCDF
+      TKBRep
+      TKTopAlgo
+      TKGeomAlgo
+      TKGeomBase
+      TKOffset
+      TKPrim
+      TKSTEP
+      TKSTEPBase
+      TKSTEPAttr
+      TKHLR
+      TKFeat
+    )
+  endif()
+  if(NOT DEFINED OCC_OCAF_LIBRARIES)
+    set(OCC_OCAF_LIBRARIES
+      TKCAF
+      TKXCAF
+      TKLCAF
+      TKXDESTEP
+      TKXDEIGES
+      TKMeshVS
+    )
+    if(OCC_VERSION_STRING VERSION_LESS 6.7.3)
+      list(APPEND OCC_OCAF_LIBRARIES TKAdvTools)
+    endif(OCC_VERSION_STRING VERSION_LESS 6.7.3)
+  endif()
   message(STATUS "-- Found OCE/OpenCASCADE version: ${OCC_VERSION_STRING}")
   message(STATUS "-- OCE/OpenCASCADE include directory: ${OCC_INCLUDE_DIR}")
   message(STATUS "-- OCE/OpenCASCADE shared libraries directory: ${OCC_LIBRARY_DIR}")