diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0db9bb04783388fc472924e406b680348f1cad81..85350edf2a6f08d2d9af878de21b3dd037aaa574 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,6 +145,7 @@ ADD_SUBDIRECTORY( GeoLib )
 ADD_SUBDIRECTORY( MathLib )
 ADD_SUBDIRECTORY( MeshLib )
 ADD_SUBDIRECTORY( MeshGeoToolsLib )
+ADD_SUBDIRECTORY( NumLib )
 IF( OGS_BUILD_CLI )
 	ADD_SUBDIRECTORY( OGS )
 ENDIF() # OGS_BUILD_CLI
diff --git a/NumLib/CMakeLists.txt b/NumLib/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f501692df46851771611e02638e4420dc95ef561
--- /dev/null
+++ b/NumLib/CMakeLists.txt
@@ -0,0 +1,26 @@
+#Source files grouped by a directory
+GET_SOURCE_FILES(SOURCES_NUMLIB)
+SET ( SOURCES ${SOURCES_NUMLIB})
+
+GET_SOURCE_FILES(SOURCES_FEM Fem)
+SET ( SOURCES ${SOURCES} ${SOURCES_FEM})
+
+INCLUDE_DIRECTORIES (
+	.
+	../BaseLib
+	../MathLib
+	../MeshLib
+)
+
+
+# Create the library
+ADD_LIBRARY( NumLib STATIC ${SOURCES} )
+
+SET_TARGET_PROPERTIES(NumLib PROPERTIES LINKER_LANGUAGE CXX)
+
+TARGET_LINK_LIBRARIES ( NumLib 
+	BaseLib
+	GeoLib
+	MathLib
+)
+
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 499c59f6bfa84f2fc00711e2fbe21f22b263e6cb..bc9ee3bc3840b6f5a54c3511458fe7eb39a3da28 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -49,6 +49,7 @@ TARGET_LINK_LIBRARIES(testrunner
 	MathLib
 	MeshLib
 	MeshGeoToolsLib
+	NumLib
 	OgsLib
 	logog
 	${BOOST_LIBRARIES}