diff --git a/cpu.cmake b/cpu.cmake
index 13f216203bfeefb9c550b8be470af4cf181a44b4..4be514947a3d1a21a440993f62b5d9e4e57807fd 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -29,7 +29,9 @@ SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
 SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
 SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
 
-SET(USE_LIGGGHTS OFF CACHE BOOL "include LIGGGHTS library support")
+SET(ENABLE_MODULE_LiggghtsCoupling OFF CACHE BOOL "enable coupling with LIGGGHTS library")
+SET(ENABLE_MODULE_NonNewtonianFluids OFF CACHE BOOL "enable non-Newtonian fluids module")
+SET(ENABLE_MODULE_MultiphaseFlow OFF CACHE BOOL "enable multiphase flow module")
 
 #MPI
 IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
@@ -85,9 +87,17 @@ if(BUILD_VF_PYTHON_BINDINGS)
     add_subdirectory(src/cpu/simulationconfig)
 endif()
 
-if(USE_LIGGGHTS)
+if(ENABLE_MODULE_LiggghtsCoupling)
     add_subdirectory(src/cpu/LiggghtsCoupling)
 endif()
 
+if(ENABLE_MODULE_NonNewtonianFluids)
+    add_subdirectory(src/cpu/NonNewtonianFluids)
+endif()
+
+if(ENABLE_MODULE_MultiphaseFlow)
+    add_subdirectory(src/cpu/MultiphaseFlow)
+endif()
+
 set (APPS_ROOT_CPU "${VF_ROOT_DIR}/apps/cpu/")
 include(${APPS_ROOT_CPU}/Applications.cmake)
\ No newline at end of file
diff --git a/src/cpu/MultiphaseFlow/CMakeLists.txt b/src/cpu/MultiphaseFlow/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..35765164bce5ce208f1c43fcc7345cbd77f4e999
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/CMakeLists.txt
@@ -0,0 +1 @@
+vf_add_library(PUBLIC_LINK VirtualFluidsCore)
\ No newline at end of file
diff --git a/src/cpu/NonNewtonianFluids/CMakeLists.txt b/src/cpu/NonNewtonianFluids/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..35765164bce5ce208f1c43fcc7345cbd77f4e999
--- /dev/null
+++ b/src/cpu/NonNewtonianFluids/CMakeLists.txt
@@ -0,0 +1 @@
+vf_add_library(PUBLIC_LINK VirtualFluidsCore)
\ No newline at end of file