diff --git a/CMakeLists.txt b/CMakeLists.txt
index 159af4961..fdc19a18c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ if (FREECAD_BUILD_DEBIAN)
     # A Debian package for SMESH doesn't exist
     #set(FREECAD_USE_EXTERNAL_SMESH ON)
 endif (FREECAD_BUILD_DEBIAN)
-if(BUILD_MESH_PART OR BUILD_FEM)
+if(BUILD_FEM)
     set(BUILD_SMESH ON)
 endif()
 
@@ -272,7 +272,7 @@ REQUIRES_MODS(BUILD_IDF                BUILD_PART)
 REQUIRES_MODS(BUILD_IMPORT             BUILD_PART)
 REQUIRES_MODS(BUILD_INSPECTION         BUILD_MESH BUILD_POINTS BUILD_PART)
 REQUIRES_MODS(BUILD_JTREADER           BUILD_MESH)
-REQUIRES_MODS(BUILD_MESH_PART          BUILD_PART BUILD_MESH)
+REQUIRES_MODS(BUILD_MESH_PART          BUILD_PART BUILD_MESH BUILD_SMESH)
 REQUIRES_MODS(BUILD_OPENSCAD           BUILD_MESH_PART BUILD_DRAFT)
 REQUIRES_MODS(BUILD_PART_DESIGN        BUILD_SKETCHER)
 REQUIRES_MODS(BUILD_PATH               BUILD_PART BUILD_ROBOT)
diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt
index f3ec4ebc2..2f3e95083 100644
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -36,7 +36,7 @@ if(BUILD_FEM_NETGEN)
         SMESH
         SMDS
     )
-else(BUILD_FEM_NETGEN)
+elseif(BUILD_SMESH)
     set(MeshPart_LIBS
         Part
         Mesh
@@ -44,6 +44,11 @@ else(BUILD_FEM_NETGEN)
         SMESH
         SMDS
     )
+else(BUILD_FEM_NETGEN)
+    set(MeshPart_LIBS
+        Part
+        Mesh
+    )
 endif(BUILD_FEM_NETGEN)