Update CMake config to work with smesh 6.5.3.1.

New fork of standalone smesh is available here:
https://github.com/tpaviot/smesh

src/3rdParty/CMakeLists.txt

@@ -35,7 +35,7 @@ if(BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
 endif(BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
 
 # Build SalomeMesh for all Platforms since heavily patched
-if (BUILD_SMESH)
+if (BUILD_SMESH AND NOT FREECAD_USE_EXTERNAL_SMESH)
     add_subdirectory(salomesmesh)
-endif(BUILD_SMESH)
+endif()
 

src/Mod/Fem/App/CMakeLists.txt

@@ -21,7 +21,7 @@ include_directories(
     ${PYTHON_INCLUDE_PATH}
     ${ZLIB_INCLUDE_DIR}
     ${XERCESC_INCLUDE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc 
+    ${SMESH_INCLUDE_DIR}
 )
 
 link_directories(${OCC_LIBRARY_DIR})
@@ -34,6 +34,8 @@ if(BUILD_FEM_NETGEN)
         StdMeshers
         NETGENPlugin
         SMESH
+        SMDS
+        SMESHDS
     )
 else(BUILD_FEM_NETGEN)
     set(Fem_LIBS
@@ -41,6 +43,8 @@ else(BUILD_FEM_NETGEN)
         FreeCADApp
         StdMeshers
         SMESH
+        SMDS
+        SMESHDS
     )
 endif(BUILD_FEM_NETGEN)
 

src/Mod/Fem/Gui/CMakeLists.txt

@@ -19,7 +19,7 @@ include_directories(
     ${QT_INCLUDE_DIR}
     ${PYTHON_INCLUDE_PATH}
     ${XERCESC_INCLUDE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc
+    ${SMESH_INCLUDE_DIR}
 )
 
 link_directories(${OCC_LIBRARY_DIR})

src/Mod/MeshPart/App/CMakeLists.txt

@@ -14,7 +14,6 @@ endif(BUILD_FEM_NETGEN)
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc
     ${Boost_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
@@ -34,6 +33,7 @@ if(BUILD_FEM_NETGEN)
         StdMeshers
         NETGENPlugin
         SMESH
+        SMDS
     )
 else(BUILD_FEM_NETGEN)
     set(MeshPart_LIBS
@@ -41,6 +41,7 @@ else(BUILD_FEM_NETGEN)
         Mesh
         StdMeshers
         SMESH
+        SMDS
     )
 endif(BUILD_FEM_NETGEN)