From f177bb418ee240c9e4e7e5971f7710e561b4ba30 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 11 Feb 2015 10:30:03 +0100
Subject: [PATCH] Removed extraneous whitespace.

---
 Applications/ApplicationsLib/CMakeLists.txt   |   6 +-
 Applications/CLI/CMakeLists.txt               |   2 +-
 Applications/CMakeLists.txt                   |   2 +-
 Applications/DataExplorer/Base/CMakeLists.txt |  22 ++--
 Applications/DataExplorer/CMakeLists.txt      |  14 +--
 Applications/DataExplorer/DataExplorer.cmake  |  52 ++++----
 .../DataExplorer/DataView/CMakeLists.txt      |  31 +++--
 .../DataView/DiagramView/CMakeLists.txt       |  16 +--
 .../DataView/StratView/CMakeLists.txt         |  16 +--
 .../DataExplorer/VtkAct/CMakeLists.txt        |  20 +---
 .../DataExplorer/VtkVis/CMakeLists.txt        |  30 ++---
 Applications/Utils/CMakeLists.txt             |   8 +-
 .../Utils/FileConverter/CMakeLists.txt        |  42 +++----
 Applications/Utils/GeoTools/CMakeLists.txt    |   4 +-
 Applications/Utils/MeshEdit/CMakeLists.txt    |  43 ++++---
 .../Utils/OGSFileConverter/CMakeLists.txt     |  33 +++---
 .../Utils/SimpleMeshCreation/CMakeLists.txt   |  16 +--
 AssemblerLib/CMakeLists.txt                   |   9 +-
 BaseLib/CMakeLists.txt                        |   8 +-
 FileIO/CMakeLists.txt                         |  22 ++--
 GeoLib/CMakeLists.txt                         |   2 +-
 MathLib/CMakeLists.txt                        |  58 +++++----
 MeshGeoToolsLib/CMakeLists.txt                |   2 +-
 MeshLib/CMakeLists.txt                        |   4 +-
 NumLib/CMakeLists.txt                         |  24 ++--
 ProcessLib/CMakeLists.txt                     |   2 +-
 SimpleTests/MatrixTests/CMakeLists.txt        | 111 ++++++++----------
 SimpleTests/MeshTests/CMakeLists.txt          |  12 +-
 SimpleTests/MeshTests/MPI/CMakeLists.txt      |  20 ++--
 SimpleTests/SolverTests/CMakeLists.txt        |  77 ++++++------
 Tests/CMakeLists.txt                          |  35 +++---
 scripts/cmake/CompilerSetup.cmake             |  56 ++++-----
 scripts/cmake/Find.cmake                      |  47 ++++----
 scripts/cmake/Functions.cmake                 |   5 +-
 scripts/cmake/ProjectSetup.cmake              |   6 +-
 35 files changed, 394 insertions(+), 463 deletions(-)

diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index 5ac46d4810f..3ce4fd824e1 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Source files
-set ( LIB_SOURCES ProjectData.cpp )
+set(LIB_SOURCES ProjectData.cpp)
 
 # Library
-add_library (ApplicationsLib STATIC ${LIB_SOURCES})
+add_library(ApplicationsLib STATIC ${LIB_SOURCES})
 
-target_link_libraries( ApplicationsLib
+target_link_libraries(ApplicationsLib
 	GeoLib
 	MeshGeoToolsLib
 	ProcessLib
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index 219651ed9e8..23c6fd12a86 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -23,7 +23,7 @@ include(Tests.cmake)
 ####################
 ### Installation ###
 ####################
-install (TARGETS ogs RUNTIME DESTINATION bin COMPONENT ogs_cli)
+install(TARGETS ogs RUNTIME DESTINATION bin COMPONENT ogs_cli)
 
 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "ogs" "OGS Simulator")
 cpack_add_component(ogs_cli
diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt
index ac14cfbfd3b..5cf58e97cb4 100644
--- a/Applications/CMakeLists.txt
+++ b/Applications/CMakeLists.txt
@@ -10,6 +10,6 @@ if(OGS_BUILD_GUI)
 endif() # OGS_BUILD_GUI
 
 
-if(OGS_BUILD_CLI )
+if(OGS_BUILD_CLI)
     add_subdirectory(CLI)
 endif() # OGS_BUILD_CLI
diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
index d37e0883bd1..f64ff321f6d 100644
--- a/Applications/DataExplorer/Base/CMakeLists.txt
+++ b/Applications/DataExplorer/Base/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Source files
-set( SOURCES
+set(SOURCES
 	OGSError.cpp
 	QNonScalableGraphicsTextItem.cpp
 	RecentFiles.cpp
@@ -13,7 +13,7 @@ set( SOURCES
 )
 
 # Moc headers
-set( MOC_HEADERS
+set(MOC_HEADERS
 	RecentFiles.h
 	TreeModel.h
 	ColorPickerPushButton.h
@@ -23,7 +23,7 @@ set( MOC_HEADERS
 )
 
 # Header files
-set( HEADERS
+set(HEADERS
 	LastSavedFileDirectory.h
 	OGSError.h
 	QNonScalableGraphicsTextItem.h
@@ -32,29 +32,21 @@ set( HEADERS
 	StrictDoubleValidator.h
 )
 
-# UI files
-set ( UIS
-)
-
 # Put moc files in a project folder
 source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
 source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
 
-# Run Qts user interface compiler uic on .ui files
-qt4_wrap_ui( UI_HEADERS ${UIS} )
-
 # Run Qts meta object compiler moc on header files
-qt4_wrap_cpp( MOC_SOURCES ${MOC_HEADERS} )
+qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 
 # Create the library
-add_library( QtBase STATIC
+add_library(QtBase STATIC
 	${SOURCES}
 	${HEADERS}
 	${MOC_HEADERS}
 	${MOC_SOURCES}
-	${UIS}
 )
 
-target_link_libraries( QtBase ${QT_LIBRARIES} )
+target_link_libraries(QtBase ${QT_LIBRARIES})
 
-set_property(TARGET QtBase PROPERTY FOLDER "DataExplorer")
\ No newline at end of file
+set_property(TARGET QtBase PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/CMakeLists.txt b/Applications/DataExplorer/CMakeLists.txt
index 3eb8dcd8900..c4497ff132e 100644
--- a/Applications/DataExplorer/CMakeLists.txt
+++ b/Applications/DataExplorer/CMakeLists.txt
@@ -9,10 +9,10 @@ if(VTKOSGCONVERTER_FOUND)
 endif()
 
 # Add subprojects
-add_subdirectory( Base )
-add_subdirectory( DataView/StratView )
-add_subdirectory( DataView )
-add_subdirectory( DataView/DiagramView )
-add_subdirectory( VtkVis )
-add_subdirectory( VtkAct )
-include( DataExplorer.cmake )
+add_subdirectory(Base)
+add_subdirectory(DataView/StratView)
+add_subdirectory(DataView)
+add_subdirectory(DataView/DiagramView)
+add_subdirectory(VtkVis)
+add_subdirectory(VtkAct)
+include(DataExplorer.cmake)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 01a28821197..c5be9c20ffa 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -1,24 +1,19 @@
 # Source files
-set( SOURCES
+set(SOURCES
 	mainwindow.cpp
 	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
 	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/FileListDialog.cpp
 )
 
 # Moc Header files
-set( MOC_HEADERS
+set(MOC_HEADERS
 	mainwindow.h
 	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/OGSFileConverter.h
 	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/FileListDialog.h
 )
 
-# Header files
-set( HEADERS
-
-)
-
 # UI files
-set( UIS
+set(UIS
 	mainwindow.ui
 	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/OGSFileConverter.ui
 	${CMAKE_SOURCE_DIR}/Applications/Utils/OGSFileConverter/FileList.ui
@@ -26,12 +21,12 @@ set( UIS
 
 
 # Run Qts user interface compiler uic on .ui files
-QT4_WRAP_UI( UI_HEADERS ${UIS} )
+qt4_wrap_ui(UI_HEADERS ${UIS} )
 
-QT4_ADD_RESOURCES( QTRESOURCES ./Img/icons.qrc )
+qt4_add_resources(QTRESOURCES ./Img/icons.qrc )
 
 # Run Qts meta object compiler moc on header files
-QT4_WRAP_CPP( MOC_SOURCES ${MOC_HEADERS} )
+qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS} )
 
 # Include the headers which are generated by uic and moc
 # and include additional header
@@ -67,10 +62,9 @@ source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
 set(APP_ICON ${CMAKE_SOURCE_DIR}/scripts/packaging/ogs-de-icon.icns)
 
 # Create the executable
-add_executable( DataExplorer MACOSX_BUNDLE
+add_executable(DataExplorer MACOSX_BUNDLE
 	main.cpp
 	${SOURCES}
-	${HEADERS}
 	${MOC_HEADERS}
 	${MOC_SOURCES}
 	${UIS}
@@ -79,7 +73,7 @@ add_executable( DataExplorer MACOSX_BUNDLE
 	exe-icon.rc
 )
 
-target_link_libraries( DataExplorer
+target_link_libraries(DataExplorer
 	${QT_LIBRARIES}
 	ApplicationsLib
 	BaseLib
@@ -100,28 +94,28 @@ target_link_libraries( DataExplorer
 )
 
 if(VTK_NETCDF_FOUND)
-	target_link_libraries( DataExplorer vtkNetCDF vtkNetCDF_cxx )
+	target_link_libraries(DataExplorer vtkNetCDF vtkNetCDF_cxx )
 else()
-	target_link_libraries( DataExplorer ${Shapelib_LIBRARIES} )
+	target_link_libraries(DataExplorer ${Shapelib_LIBRARIES} )
 endif () # Shapelib_FOUND
 
 if (GEOTIFF_FOUND)
-	target_link_libraries( DataExplorer ${GEOTIFF_LIBRARIES} )
+	target_link_libraries(DataExplorer ${GEOTIFF_LIBRARIES} )
 endif () # GEOTIFF_FOUND
 
-add_dependencies ( DataExplorer VtkVis )
+add_dependencies (DataExplorer VtkVis)
 
 if(MSVC)
 	# Set linker flags
 	set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT /IGNORE:4099")
-	target_link_libraries( DataExplorer winmm)
+	target_link_libraries(DataExplorer winmm)
 endif()
 
 ### OpenSG support ###
 if (VTKOSGCONVERTER_FOUND)
 	USE_OPENSG(DataExplorer)
-	include_directories( ${VTKOSGCONVERTER_INCLUDE_DIRS} )
-	target_link_libraries( DataExplorer ${VTKOSGCONVERTER_LIBRARIES} )
+	include_directories(${VTKOSGCONVERTER_INCLUDE_DIRS})
+	target_link_libraries(DataExplorer ${VTKOSGCONVERTER_LIBRARIES})
 endif ()
 
 if(VTKFBXCONVERTER_FOUND)
@@ -141,13 +135,13 @@ if(APPLE)
 	include(packaging/PackagingMacros)
 	ConfigureMacOSXBundle(DataExplorer ${APP_ICON})
 
-	install (TARGETS DataExplorer DESTINATION .)
+	install(TARGETS DataExplorer DESTINATION .)
 	set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
 	include(InstallRequiredSystemLibraries)
 	include(DeployQt4)
 	INSTALL_QT4_EXECUTABLE(DataExplorer.app "" "" "" "" "" ogs_gui)
 else()
-	install (TARGETS DataExplorer RUNTIME DESTINATION bin COMPONENT ogs_gui)
+	install(TARGETS DataExplorer RUNTIME DESTINATION bin COMPONENT ogs_gui)
 endif()
 
 cpack_add_component(ogs_gui
@@ -170,14 +164,14 @@ endif()
 include(GetPrerequisites)
 if(EXISTS ${OGS_GUI_EXE})
 	if(MSVC)
-		GET_PREREQUISITES(${OGS_GUI_EXE} OGS_GUI_DEPENDENCIES 1 1 "" "")
+		get_prerequisites(${OGS_GUI_EXE} OGS_GUI_DEPENDENCIES 1 1 "" "")
 	else()
-		GET_PREREQUISITES(${OGS_GUI_EXE} OGS_GUI_DEPENDENCIES 0 1 "/usr/local/lib;/;${VTK_DIR};/usr/lib64;" "")
+		get_prerequisites(${OGS_GUI_EXE} OGS_GUI_DEPENDENCIES 0 1 "/usr/local/lib;/;${VTK_DIR};/usr/lib64;" "")
 	endif()
-	message (STATUS "DataExplorer depends on:")
+	message(STATUS "DataExplorer depends on:")
 	foreach(DEPENDENCY ${OGS_GUI_DEPENDENCIES})
 		if(NOT ${DEPENDENCY} STREQUAL "not") # Some bug on Linux?
-			GP_RESOLVE_ITEM ("/" "${DEPENDENCY}" ${OGS_GUI_EXE} "/usr/local/lib;/;${VTK_DIR};/usr/lib64;" DEPENDENCY_PATH)
+			gp_resolve_item("/" "${DEPENDENCY}" ${OGS_GUI_EXE} "/usr/local/lib;/;${VTK_DIR};/usr/lib64;" DEPENDENCY_PATH)
 			get_filename_component(RESOLVED_DEPENDENCY_PATH "${DEPENDENCY_PATH}" REALPATH)
 			string(TOLOWER ${DEPENDENCY} DEPENDENCY_LOWER)
 			if("${DEPENDENCY_LOWER}" MATCHES "tiff|blas|lapack|proj|jpeg|qt|gfortran|vtk|boost|png")
@@ -185,8 +179,8 @@ if(EXISTS ${OGS_GUI_EXE})
 				message("    ${DEPENDENCY}")
 			endif()
 		endif()
-	endforeach ()
-	install (FILES ${DEPENDENCY_PATHS} DESTINATION bin COMPONENT ogs_gui)
+	endforeach()
+	install(FILES ${DEPENDENCY_PATHS} DESTINATION bin COMPONENT ogs_gui)
 	if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 		install(PROGRAMS data-explorer.sh DESTINATION . COMPONENT ogs_gui)
 	endif()
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index 9ecb100b578..ee2f5683c9e 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Source files
-set( SOURCES
+set(SOURCES
 	ColorTableModel.cpp
 	ColorTableView.cpp
 	CondFromRasterDialog.cpp
@@ -41,7 +41,7 @@ set( SOURCES
 )
 
 # Moc Header files
-set( MOC_HEADERS
+set(MOC_HEADERS
 	ColorTableModel.h
 	ColorTableView.h
 	CondFromRasterDialog.h
@@ -80,7 +80,7 @@ set( MOC_HEADERS
 )
 
 # Header files
-set( HEADERS
+set(HEADERS
 	BaseItem.h
 	CondItem.h
 	DirectConditionGenerator.h
@@ -92,7 +92,7 @@ set( HEADERS
 )
 
 # UI files
-set( UIS
+set(UIS
 	CondFromRaster.ui
 	ConditionWriter.ui
 	DataExplorerSettings.ui
@@ -125,10 +125,10 @@ source_group("Data Model Header Files" REGULAR_EXPRESSION "[.]*Item.h|[.]*Model.
 source_group("Data Model Source Files" REGULAR_EXPRESSION "[.]*Item.cpp|[.]*Model.cpp|[.]*View.cpp")
 
 # Run Qts user interface compiler uic on .ui files
-qt4_wrap_ui( UI_HEADERS ${UIS} )
+qt4_wrap_ui(UI_HEADERS ${UIS})
 
 # Run Qts meta object compiler moc on header files
-qt4_wrap_cpp( MOC_SOURCES ${MOC_HEADERS} )
+qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 
 
 # Include the headers which are generated by uic and moc
@@ -140,7 +140,6 @@ include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/DiagramView
 	${CMAKE_CURRENT_BINARY_DIR}/StratView
-
 	${SOURCE_DIR_REL}/BaseLib
 	${SOURCE_DIR_REL}/MathLib
 	${SOURCE_DIR_REL}/GeoLib
@@ -154,13 +153,13 @@ include_directories(
 	${GUI_SOURCE_DIR_REL}/VtkVis
 )
 
-if (VTKOSGCONVERTER_FOUND)
-	include_directories( ${VTKOSGCONVERTER_INCLUDE_DIRS} )
-endif ()
+if(VTKOSGCONVERTER_FOUND)
+	include_directories(${VTKOSGCONVERTER_INCLUDE_DIRS})
+endif()
 
-if (GEOTIFF_FOUND)
-	include_directories( ${GEOTIFF_INCLUDE_DIRS} )
-endif () # GEOTIFF_FOUND
+if(GEOTIFF_FOUND)
+	include_directories(${GEOTIFF_INCLUDE_DIRS})
+endif() # GEOTIFF_FOUND
 
 # Put moc files in a project folder
 source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
@@ -168,7 +167,7 @@ source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
 
 
 # Create the library
-add_library( QtDataView STATIC
+add_library(QtDataView STATIC
 	${SOURCES}
 	${HEADERS}
 	${MOC_HEADERS}
@@ -178,7 +177,7 @@ add_library( QtDataView STATIC
 )
 
 # Link Qt library
-target_link_libraries( QtDataView
+target_link_libraries(QtDataView
 	${QT_LIBRARIES}
 	FileIO
 	GeoLib
@@ -192,7 +191,7 @@ target_link_libraries( QtDataView
 include(AddCatalystDependency)
 ADD_CATALYST_DEPENDENCY(QtDataView)
 
-if (GEOTIFF_FOUND)
+if(GEOTIFF_FOUND)
 	target_link_libraries( QtDataView ${GEOTIFF_LIBRARIES} )
 endif () # GEOTIFF_FOUND
 
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index a2e0df3d5e8..a1aad85c51e 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Source files
-set( SOURCES
+set(SOURCES
 	DetailWindow.cpp
 	DiagramList.cpp
 	DiagramPrefsDialog.cpp
@@ -10,14 +10,14 @@ set( SOURCES
 )
 
 # Moc Header files
-set( MOC_HEADERS
+set(MOC_HEADERS
 	DetailWindow.h
 	DiagramPrefsDialog.h
 	DiagramView.h
 )
 
 # Header files
-set( HEADERS
+set(HEADERS
 	DiagramList.h
 	QArrow.h
 	QGraphicsGrid.h
@@ -25,16 +25,16 @@ set( HEADERS
 )
 
 # UI files
-set( UIS
+set(UIS
 	DetailWindow.ui
 	DiagramPrefs.ui
 )
 
 # Run Qts user interface compiler uic on .ui files
-QT4_WRAP_UI( UI_HEADERS ${UIS} )
+qt4_wrap_ui(UI_HEADERS ${UIS})
 
 # Run Qts meta object compiler moc on header files
-QT4_WRAP_CPP( MOC_SOURCES ${MOC_HEADERS} )
+qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 
 # Include the headers which are generated by uic and moc
 # and include additional header
@@ -55,7 +55,7 @@ include_directories(
 source_group("Moc Files" REGULAR_EXPRESSION moc_*)
 
 # Create the library
-add_library( QtDiagramView STATIC
+add_library(QtDiagramView STATIC
 	${SOURCES}
 	${HEADERS}
 	${MOC_HEADERS}
@@ -64,7 +64,7 @@ add_library( QtDiagramView STATIC
 )
 
 # Link Qt library
-target_link_libraries( QtDiagramView
+target_link_libraries(QtDiagramView
 	${QT_LIBRARIES}
 	GeoLib
 )
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 02c1b383e7e..1f07213bcf1 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Source files
-set( SOURCES
+set(SOURCES
 	StratBar.cpp
 	StratScene.cpp
 	StratView.cpp
@@ -7,27 +7,27 @@ set( SOURCES
 )
 
 # Moc Header files
-set( MOC_HEADERS
+set(MOC_HEADERS
 	StratView.h
 	StratWindow.h
 )
 
 # Header files
-set( HEADERS
+set(HEADERS
 	StratBar.h
 	StratScene.h
 )
 
 # UI files
-set( UIS
+set(UIS
 	StratWindow.ui
 )
 
 # Run Qts user interface compiler uic on .ui files
-qt4_wrap_ui( UI_HEADERS ${UIS} )
+qt4_wrap_ui(UI_HEADERS ${UIS})
 
 # Run Qts meta object compiler moc on header files
-qt4_wrap_cpp( MOC_SOURCES ${MOC_HEADERS} )
+qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 
 # Include the headers which are generated by uic and moc
 # and include additional header
@@ -47,7 +47,7 @@ source_group("Moc Files" REGULAR_EXPRESSION moc_*)
 
 # Create the library
 #add_executable( StratView
-add_library( QtStratView STATIC
+add_library(QtStratView STATIC
 	${SOURCES}
 	${HEADERS}
 	${MOC_HEADERS}
@@ -56,7 +56,7 @@ add_library( QtStratView STATIC
 )
 
 # Link Qt library
-target_link_libraries( QtStratView
+target_link_libraries(QtStratView
 	${QT_LIBRARIES}
 	BaseLib
 	GeoLib
diff --git a/Applications/DataExplorer/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
index eacfb6606b4..55a17f8932c 100644
--- a/Applications/DataExplorer/VtkAct/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkAct/CMakeLists.txt
@@ -1,33 +1,21 @@
 # Source files
-set( SOURCES
+set(SOURCES
 	VtkPickCallback.cpp
 	VtkCustomInteractorStyle.cpp
 )
 
 # Moc headers
-set( MOC_HEADERS
+set(MOC_HEADERS
 	VtkPickCallback.h
 	VtkCustomInteractorStyle.h
 )
 
-# Header files
-set( HEADERS
-
-)
-
-# UI files
-#set ( UIS
-#)
-
 # Put moc files in a project folder
 source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
 source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
 
-# Run Qts user interface compiler uic on .ui files
-#qt4_wrap_ui( UI_HEADERS ${UIS} )
-
 # Run Qts meta object compiler moc on header files
-qt4_wrap_cpp( MOC_SOURCES ${MOC_HEADERS} )
+qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
@@ -44,10 +32,8 @@ include_directories(
 # Create the library
 add_library( VtkAct STATIC
 	${SOURCES}
-	${HEADERS}
 	${MOC_HEADERS}
 	${MOC_SOURCES}
-	${UIS}
 )
 
 include(AddCatalystDependency)
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 7c5dec57b10..82038dc9018 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Source files
-set( SOURCES
+set(SOURCES
 	MeshFromRasterDialog.cpp
 	QVtkDataSetMapper.cpp
 	VisPrefsDialog.cpp
@@ -45,7 +45,7 @@ set( SOURCES
 )
 
 # Moc headers
-set( MOC_HEADERS
+set(MOC_HEADERS
 	MeshFromRasterDialog.h
 	QVtkDataSetMapper.h
 	VisPrefsDialog.h
@@ -61,7 +61,7 @@ set( MOC_HEADERS
 )
 
 # Header files
-set( HEADERS
+set(HEADERS
 	VtkAppendArrayFilter.h
 	VtkBGImageSource.h
 	VtkColorByHeightFilter.h
@@ -95,7 +95,7 @@ set( HEADERS
 )
 
 # UI files
-set ( UIS
+set(UIS
 	MeshFromRaster.ui
 	VtkAddFilterDialogBase.ui
 	VtkVisTabWidgetBase.ui
@@ -116,10 +116,10 @@ source_group("Source Header Files" REGULAR_EXPRESSION "[.]*Source.h")
 source_group("Source Source Files" REGULAR_EXPRESSION "[.]*Source.cpp")
 
 # Run Qts user interface compiler uic on .ui files
-QT4_WRAP_UI( UI_HEADERS ${UIS} )
+qt4_wrap_ui(UI_HEADERS ${UIS})
 
 # Run Qts meta object compiler moc on header files
-QT4_WRAP_CPP( MOC_SOURCES ${MOC_HEADERS} )
+qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
@@ -140,7 +140,7 @@ include_directories(
 )
 
 # Create the library
-add_library( VtkVis STATIC
+add_library(VtkVis STATIC
 	${SOURCES}
 	${HEADERS}
 	${MOC_HEADERS}
@@ -151,18 +151,18 @@ add_library( VtkVis STATIC
 include(AddCatalystDependency)
 ADD_CATALYST_DEPENDENCY(VtkVis)
 
-if (GEOTIFF_FOUND)
-	include_directories( ${GEOTIFF_INCLUDE_DIRS} )
-	target_link_libraries( VtkVis ${GEOTIFF_LIBRARIES} )
-endif () # GEOTIFF_FOUND
+if(GEOTIFF_FOUND)
+	include_directories(${GEOTIFF_INCLUDE_DIRS})
+	target_link_libraries(VtkVis ${GEOTIFF_LIBRARIES})
+endif() # GEOTIFF_FOUND
 
-target_link_libraries( VtkVis ${QT_LIBRARIES} )
+target_link_libraries(VtkVis ${QT_LIBRARIES})
 
 add_dependencies(VtkVis QtDataView)
 
-if (VTKOSGCONVERTER_FOUND)
+if(VTKOSGCONVERTER_FOUND)
 	USE_OPENSG(VtkVis)
-	include_directories( ${VTKOSGCONVERTER_INCLUDE_DIRS} )
-endif ()
+	include_directories(${VTKOSGCONVERTER_INCLUDE_DIRS})
+endif()
 
 set_property(TARGET VtkVis PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/Utils/CMakeLists.txt b/Applications/Utils/CMakeLists.txt
index 7e1b626e285..a084ca922ff 100644
--- a/Applications/Utils/CMakeLists.txt
+++ b/Applications/Utils/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_subdirectory( FileConverter )
-add_subdirectory( GeoTools )
-add_subdirectory( MeshEdit )
-add_subdirectory( SimpleMeshCreation )
+add_subdirectory(FileConverter)
+add_subdirectory(GeoTools)
+add_subdirectory(MeshEdit)
+add_subdirectory(SimpleMeshCreation)
 
 if(OGS_BUILD_GUI)
 	add_subdirectory(OGSFileConverter)
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index e282a8a07a1..578fb17ea1b 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -10,10 +10,10 @@ include_directories(
 )
 
 if (QT4_FOUND)
-	add_executable( ConvertSHPToGLI ConvertSHPToGLI.cpp )
+	add_executable(ConvertSHPToGLI ConvertSHPToGLI.cpp)
 	set_target_properties(ConvertSHPToGLI PROPERTIES FOLDER Utilities)
 
-	target_link_libraries( ConvertSHPToGLI
+	target_link_libraries(ConvertSHPToGLI
 		FileIO
 		GeoLib
 		BaseLib
@@ -21,16 +21,16 @@ if (QT4_FOUND)
 		${QT_LIBRARIES}
 	)
 
-	add_executable (generateBCandGLI generateBCandGLI.cpp )
-	target_link_libraries (generateBCandGLI
+	add_executable(generateBCandGLI generateBCandGLI.cpp )
+	target_link_libraries(generateBCandGLI
 		ApplicationsLib
 		FileIO
 		GeoLib
 		${QT_LIBRARIES}
 	)
 
-	add_executable (generateBCFromPolyline generateBCFromPolyline.cpp )
-	target_link_libraries (generateBCFromPolyline
+	add_executable(generateBCFromPolyline generateBCFromPolyline.cpp )
+	target_link_libraries(generateBCFromPolyline
 		ApplicationsLib
 		FileIO
 		GeoLib
@@ -40,9 +40,9 @@ if (QT4_FOUND)
 	set_target_properties(generateBCandGLI generateBCFromPolyline
 		PROPERTIES FOLDER Utilities)
 
-	add_executable (FEFLOW2OGS FEFLOW2OGS.cpp)
+	add_executable(FEFLOW2OGS FEFLOW2OGS.cpp)
 	set_target_properties(FEFLOW2OGS PROPERTIES FOLDER Utilities)
-	target_link_libraries (FEFLOW2OGS
+	target_link_libraries(FEFLOW2OGS
 		GeoLib
 		MeshLib
 		FileIO
@@ -54,8 +54,8 @@ if (QT4_FOUND)
 endif () # QT4_FOUND
 
 if (Boost_FOUND)
-	add_executable (generateMatPropsFromMatID generateMatPropsFromMatID.cpp )
-	target_link_libraries (generateMatPropsFromMatID
+	add_executable(generateMatPropsFromMatID generateMatPropsFromMatID.cpp )
+	target_link_libraries(generateMatPropsFromMatID
 		FileIO
 		MeshLib
 		logog
@@ -67,9 +67,9 @@ if (Boost_FOUND)
 		PROPERTIES FOLDER Utilities)
 endif () # Boost_FOUND
 
-add_executable (GMSH2OGS GMSH2OGS.cpp)
+add_executable(GMSH2OGS GMSH2OGS.cpp)
 set_target_properties(GMSH2OGS PROPERTIES FOLDER Utilities)
-target_link_libraries (GMSH2OGS
+target_link_libraries(GMSH2OGS
 	MeshLib
 	FileIO
 	InSituLib
@@ -77,12 +77,12 @@ target_link_libraries (GMSH2OGS
 )
 ADD_CATALYST_DEPENDENCY(GMSH2OGS)
 if(MSVC)
-	target_link_libraries (GMSH2OGS winmm)
+	target_link_libraries(GMSH2OGS winmm)
 endif()
 
-add_executable (OGS2VTK OGS2VTK.cpp)
+add_executable(OGS2VTK OGS2VTK.cpp)
 set_target_properties(OGS2VTK PROPERTIES FOLDER Utilities)
-target_link_libraries (OGS2VTK
+target_link_libraries(OGS2VTK
 	MeshLib
 	FileIO
 	zlib
@@ -91,9 +91,9 @@ target_link_libraries (OGS2VTK
 )
 ADD_CATALYST_DEPENDENCY(OGS2VTK)
 
-add_executable (VTK2OGS VTK2OGS.cpp)
+add_executable(VTK2OGS VTK2OGS.cpp)
 set_target_properties(VTK2OGS PROPERTIES FOLDER Utilities)
-target_link_libraries (VTK2OGS
+target_link_libraries(VTK2OGS
 	MeshLib
 	FileIO
 	zlib
@@ -102,9 +102,9 @@ target_link_libraries (VTK2OGS
 )
 ADD_CATALYST_DEPENDENCY(VTK2OGS)
 
-add_executable (VTK2TIN VTK2TIN.cpp)
+add_executable(VTK2TIN VTK2TIN.cpp)
 set_target_properties(VTK2TIN PROPERTIES FOLDER Utilities)
-target_link_libraries (VTK2TIN
+target_link_libraries(VTK2TIN
 	MeshLib
 	FileIO
 	zlib
@@ -113,9 +113,9 @@ target_link_libraries (VTK2TIN
 )
 ADD_CATALYST_DEPENDENCY(VTK2TIN)
 
-add_executable (TIN2VTK TIN2VTK.cpp)
+add_executable(TIN2VTK TIN2VTK.cpp)
 set_target_properties(TIN2VTK PROPERTIES FOLDER Utilities)
-target_link_libraries (TIN2VTK
+target_link_libraries(TIN2VTK
 	MeshLib
 	FileIO
 	zlib
diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt
index 676185cfe40..ad7a25ba68b 100644
--- a/Applications/Utils/GeoTools/CMakeLists.txt
+++ b/Applications/Utils/GeoTools/CMakeLists.txt
@@ -7,8 +7,8 @@ include_directories(
 )
 
 if(QT4_FOUND)
-	add_executable( TriangulatePolyline TriangulatePolyline.cpp )
-	target_link_libraries( TriangulatePolyline
+	add_executable(TriangulatePolyline TriangulatePolyline.cpp)
+	target_link_libraries(TriangulatePolyline
 		BaseLib
 		FileIO
 		MathLib
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index 65c1d5b841a..46b1ef989a6 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -12,8 +12,8 @@ include_directories(
 # Create executables
 if(QT4_FOUND)
 
-	add_executable( moveMeshNodes moveMeshNodes.cpp )
-	target_link_libraries( moveMeshNodes
+	add_executable(moveMeshNodes moveMeshNodes.cpp)
+	target_link_libraries(moveMeshNodes
 		BaseLib
 		FileIO
 		MathLib
@@ -24,13 +24,12 @@ if(QT4_FOUND)
 	)
 	ADD_CATALYST_DEPENDENCY(moveMeshNodes)
 
-	set_target_properties(moveMeshNodes
-		PROPERTIES FOLDER Utilities)
+	set_target_properties(moveMeshNodes PROPERTIES FOLDER Utilities)
 
 endif() # QT4_FOUND
 
-add_executable( removeMeshElements removeMeshElements.cpp )
-target_link_libraries( removeMeshElements
+add_executable(removeMeshElements removeMeshElements.cpp)
+target_link_libraries(removeMeshElements
 	BaseLib
 	FileIO
 	MathLib
@@ -41,8 +40,8 @@ target_link_libraries( removeMeshElements
 ADD_CATALYST_DEPENDENCY(removeMeshElements)
 set_target_properties(removeMeshElements PROPERTIES FOLDER Utilities)
 
-add_executable( DataExplorer5NodeReordering DataExplorer5NodeReordering.cpp )
-target_link_libraries( DataExplorer5NodeReordering
+add_executable(DataExplorer5NodeReordering DataExplorer5NodeReordering.cpp)
+target_link_libraries(DataExplorer5NodeReordering
 	FileIO
 	MeshLib
 	InSituLib
@@ -51,8 +50,8 @@ target_link_libraries( DataExplorer5NodeReordering
 ADD_CATALYST_DEPENDENCY(DataExplorer5NodeReordering)
 set_target_properties(DataExplorer5NodeReordering PROPERTIES FOLDER Utilities)
 
-add_executable( MoveMesh MoveMesh.cpp )
-target_link_libraries( MoveMesh
+add_executable(MoveMesh MoveMesh.cpp)
+target_link_libraries(MoveMesh
 	FileIO
 	MeshLib
 	InSituLib
@@ -61,8 +60,8 @@ target_link_libraries( MoveMesh
 ADD_CATALYST_DEPENDENCY(MoveMesh)
 set_target_properties(MoveMesh PROPERTIES FOLDER Utilities)
 
-add_executable( appendLinesAlongPolyline appendLinesAlongPolyline.cpp )
-target_link_libraries( appendLinesAlongPolyline
+add_executable(appendLinesAlongPolyline appendLinesAlongPolyline.cpp)
+target_link_libraries(appendLinesAlongPolyline
 	BaseLib
 	FileIO
 	MathLib
@@ -76,8 +75,8 @@ ADD_CATALYST_DEPENDENCY(appendLinesAlongPolyline)
 set_target_properties(appendLinesAlongPolyline
 	PROPERTIES FOLDER Utilities)
 
-add_executable( editMaterialID editMaterialID.cpp )
-target_link_libraries( editMaterialID
+add_executable(editMaterialID editMaterialID.cpp)
+target_link_libraries(editMaterialID
 	BaseLib
 	FileIO
 	MathLib
@@ -90,8 +89,8 @@ ADD_CATALYST_DEPENDENCY(editMaterialID)
 set_target_properties(editMaterialID
 	PROPERTIES FOLDER Utilities)
 
-add_executable( checkMesh checkMesh.cpp)
-target_link_libraries ( checkMesh
+add_executable(checkMesh checkMesh.cpp)
+target_link_libraries(checkMesh
 	BaseLib
 	FileIO
 	MathLib
@@ -101,11 +100,10 @@ target_link_libraries ( checkMesh
 )
 ADD_CATALYST_DEPENDENCY(checkMesh)
 
-set_target_properties(checkMesh
-	PROPERTIES FOLDER Utilities)
+set_target_properties(checkMesh PROPERTIES FOLDER Utilities)
 
-add_executable( reviseMesh reviseMesh.cpp)
-target_link_libraries ( reviseMesh
+add_executable(reviseMesh reviseMesh.cpp)
+target_link_libraries (reviseMesh
 	BaseLib
 	FileIO
 	MathLib
@@ -115,6 +113,5 @@ target_link_libraries ( reviseMesh
 )
 ADD_CATALYST_DEPENDENCY(reviseMesh)
 
-set_target_properties(reviseMesh
-	PROPERTIES FOLDER Utilities)
-	
\ No newline at end of file
+set_target_properties(reviseMesh PROPERTIES FOLDER Utilities)
+
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 303351dc351..6e5d9832314 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -2,39 +2,34 @@
 cmake_minimum_required(VERSION 2.8.3)
 
 # Project name
-project( OGSFileConverter )
+project(OGSFileConverter)
 
 # Source files
-set( SOURCES
+set(SOURCES
 	FileListDialog.cpp
 	OGSFileConverter.cpp
 )
 
 # Moc Header files
-set( MOC_HEADERS
+set(MOC_HEADERS
 	FileListDialog.h
 	OGSFileConverter.h
 )
 
-# Header files
-set( HEADERS
-
-)
-
 # UI files
-set( UIS
+set(UIS
 	FileList.ui
 	OGSFileConverter.ui
 )
 
 # Find installed Qt4 libraries and headers
-find_package( Qt4 REQUIRED )
+find_package(Qt4 QUIET REQUIRED)
 
 # Run Qts user interface compiler uic on .ui files
-QT4_WRAP_UI( UI_HEADERS ${UIS} )
+qt4_wrap_ui(UI_HEADERS ${UIS})
 
 # Run Qts meta object compiler moc on header files
-QT4_WRAP_CPP( MOC_SOURCES ${MOC_HEADERS} )
+qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 
 # Include the headers which are generated by uic and moc
 # and include additional header
@@ -54,7 +49,7 @@ source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
 source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
 
 # Create the library
-add_executable( OGSFileConverter
+add_executable(OGSFileConverter
 	main.cpp
 	${SOURCES}
 	${HEADERS}
@@ -63,7 +58,7 @@ add_executable( OGSFileConverter
 	${UIS}
 )
 
-target_link_libraries( OGSFileConverter
+target_link_libraries(OGSFileConverter
 	${QT_LIBRARIES}
 	ApplicationsLib
 	FileIO
@@ -78,16 +73,16 @@ ADD_CATALYST_DEPENDENCY(OGSFileConverter)
 
 # Adds useful macros and variables
 # this is needed to correctly link the qt and vtk libraries through target_link_libraries
-include( ${QT_USE_FILE} )
+include(${QT_USE_FILE})
 
 # Set build configuration types
 # "RelWithDebInfo" and "MinSizeRelease" can be added here
-set ( CMAKE_CONFIGURATION_TYPES "Release;Debug" CACHE TYPE INTERNAL FORCE )
+set(CMAKE_CONFIGURATION_TYPES "Release;Debug" CACHE TYPE INTERNAL FORCE)
 
 # Set build directories
 # Binaries are created in /bin and libraries in /lib
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
-set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 set_property(TARGET OGSFileConverter PROPERTY FOLDER "Utilities")
 
@@ -95,6 +90,6 @@ set_property(TARGET OGSFileConverter PROPERTY FOLDER "Utilities")
 ### Installation ###
 ####################
 
-install (TARGETS OGSFileConverter RUNTIME DESTINATION bin COMPONENT ogs_cli)
+install(TARGETS OGSFileConverter RUNTIME DESTINATION bin COMPONENT ogs_cli)
 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "OGSFileConverter" "File Converter")
 set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "bin/OGSFileConverter.exe" "File Converter" PARENT_SCOPE)
diff --git a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
index 82e27157a9d..f42da8efc5f 100644
--- a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
+++ b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
@@ -12,9 +12,9 @@ include_directories(
 
 if(TARGET VtkVis)
 
-	add_executable( generateStructuredQuadMesh generateStructuredQuadMesh.cpp )
-	set_target_properties( generateStructuredQuadMesh PROPERTIES FOLDER Utils)
-	target_link_libraries( generateStructuredQuadMesh
+	add_executable(generateStructuredQuadMesh generateStructuredQuadMesh.cpp)
+	set_target_properties(generateStructuredQuadMesh PROPERTIES FOLDER Utils)
+	target_link_libraries(generateStructuredQuadMesh
 		MeshLib
 		FileIO
 		GeoLib
@@ -25,9 +25,9 @@ if(TARGET VtkVis)
 	)
 	ADD_CATALYST_DEPENDENCY(generateStructuredQuadMesh)
 
-	add_executable(  createMeshElemPropertiesFromASCRaster createMeshElemPropertiesFromASCRaster.cpp )
-	set_target_properties( createMeshElemPropertiesFromASCRaster PROPERTIES FOLDER Utils)
-	target_link_libraries( createMeshElemPropertiesFromASCRaster
+	add_executable(createMeshElemPropertiesFromASCRaster createMeshElemPropertiesFromASCRaster.cpp)
+	set_target_properties(createMeshElemPropertiesFromASCRaster PROPERTIES FOLDER Utils)
+	target_link_libraries(createMeshElemPropertiesFromASCRaster
 		MeshLib
 		FileIO
 		VtkVis
@@ -40,8 +40,8 @@ if(TARGET VtkVis)
 endif() # VtkVis-target is existing
 
 
-add_executable( generateStructuredMesh generateStructuredMesh.cpp )
-target_link_libraries( generateStructuredMesh
+add_executable(generateStructuredMesh generateStructuredMesh.cpp)
+target_link_libraries(generateStructuredMesh
 	BaseLib
 	FileIO
 	MathLib
diff --git a/AssemblerLib/CMakeLists.txt b/AssemblerLib/CMakeLists.txt
index 478fc16afe3..58c3980bb3c 100644
--- a/AssemblerLib/CMakeLists.txt
+++ b/AssemblerLib/CMakeLists.txt
@@ -1,11 +1,11 @@
 #Source files grouped by a directory
 GET_SOURCE_FILES(SOURCES_ASSEMBLERLIB)
-set ( SOURCES ${SOURCES_ASSEMBLERLIB})
+set(SOURCES ${SOURCES_ASSEMBLERLIB})
 
 # Create the library
-add_library( AssemblerLib STATIC ${SOURCES} )
+add_library(AssemblerLib STATIC ${SOURCES})
 
-include_directories (
+include_directories(
 	.
 	../BaseLib
 	../GeoLib
@@ -13,8 +13,7 @@ include_directories (
 	../MeshLib
 )
 
-target_link_libraries (AssemblerLib 
+target_link_libraries(AssemblerLib
 	${Boost_LIBRARIES}
 	MeshLib
 )
-
diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index 562abaa5cfb..f6feac94ef8 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -1,11 +1,9 @@
-# Source files
-
 GET_SOURCE_FILES(SOURCES)
 
 list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.cpp" BuildInfo.h)
 
 # Create the library
-add_library( BaseLib STATIC ${SOURCES})
+add_library(BaseLib STATIC ${SOURCES})
 
 set_target_properties(BaseLib PROPERTIES LINKER_LANGUAGE CXX)
 
@@ -13,10 +11,10 @@ include_directories(
 	.
 )
 
-target_link_libraries( BaseLib
+target_link_libraries(BaseLib
 	${Boost_LIBRARIES}
 )
 
 if(WIN32)
-	target_link_libraries( BaseLib WinMM )
+	target_link_libraries(BaseLib WinMM)
 endif()
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index a01d4bc3301..f34d1bd7476 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -1,6 +1,4 @@
-# Source files
-# GET_SOURCE_FILES(SOURCES_FILEIO)
-set( SOURCES
+set(SOURCES
 	AsciiRasterInterface.h
 	AsciiRasterInterface.cpp
 	GMSInterface.h
@@ -27,22 +25,22 @@ GET_SOURCE_FILES(SOURCES_LEGACY Legacy)
 GET_SOURCE_FILES(SOURCES_GMSHIO GmshIO)
 GET_SOURCE_FILES(SOURCES_RAPID_XML RapidXmlIO)
 GET_SOURCE_FILES(SOURCES_VTK VtkIO)
-set ( SOURCES ${SOURCES} ${SOURCES_LEGACY} ${SOURCES_GMSHIO} ${SOURCES_RAPID_XML} ${SOURCES_VTK})
+set(SOURCES ${SOURCES} ${SOURCES_LEGACY} ${SOURCES_GMSHIO} ${SOURCES_RAPID_XML} ${SOURCES_VTK})
 
 GET_SOURCE_FILES(SOURCES_BASE_XML XmlIO)
-set (SOURCES ${SOURCES} ${SOURCES_BASE_XML})
+set(SOURCES ${SOURCES} ${SOURCES_BASE_XML})
 GET_SOURCE_FILES(SOURCES_BOOST_XML XmlIO/Boost)
-set (SOURCES ${SOURCES} ${SOURCES_BOOST_XML})
-if (QT4_FOUND)
-	set ( SOURCES ${SOURCES} FEFLOWInterface.h FEFLOWInterface.cpp)
+set(SOURCES ${SOURCES} ${SOURCES_BOOST_XML})
+if(QT4_FOUND)
+	set(SOURCES ${SOURCES} FEFLOWInterface.h FEFLOWInterface.cpp)
 	GET_SOURCE_FILES(SOURCES_QT_XML XmlIO/Qt)
-	set ( SOURCES ${SOURCES} ${SOURCES_QT_XML})
-endif ()
+	set(SOURCES ${SOURCES} ${SOURCES_QT_XML})
+endif()
 
 # It could be used for other MPI based DDC approach in future.
 if(OGS_USE_PETSC)
 	GET_SOURCE_FILES(SOURCES_MPI_IO MPI_IO)
-	set (SOURCES ${SOURCES} ${SOURCES_MPI_IO})
+	set(SOURCES ${SOURCES} ${SOURCES_MPI_IO})
 endif()
 
 # Create the library
@@ -57,7 +55,7 @@ include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}/../BaseLib
 )
 
-target_link_libraries (FileIO
+target_link_libraries(FileIO
 	GeoLib
 	MeshLib
 	zlib
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
index 406951ed1e2..62182b21677 100644
--- a/GeoLib/CMakeLists.txt
+++ b/GeoLib/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
 )
 
-target_link_libraries (GeoLib
+target_link_libraries(GeoLib
 	BaseLib
 	MathLib
 )
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index 21dfbc4d25a..4887c539178 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -1,80 +1,78 @@
 #Source files grouped by a directory
 GET_SOURCE_FILES(SOURCES_MATHLIB)
-set ( SOURCES ${SOURCES_MATHLIB})
+set(SOURCES ${SOURCES_MATHLIB})
 
 GET_SOURCE_FILES(SOURCES_INTERPOLATIONALGORITHMS InterpolationAlgorithms)
-set ( SOURCES ${SOURCES} ${SOURCES_INTERPOLATIONALGORITHMS})
+set(SOURCES ${SOURCES} ${SOURCES_INTERPOLATIONALGORITHMS})
 
 GET_SOURCE_FILES(SOURCES_INTEGRATION Integration)
-set ( SOURCES ${SOURCES} ${SOURCES_INTEGRATION})
+set(SOURCES ${SOURCES} ${SOURCES_INTEGRATION})
 
 GET_SOURCE_FILES(SOURCES_LINALG LinAlg)
-set ( SOURCES ${SOURCES} ${SOURCES_LINALG})
+set(SOURCES ${SOURCES} ${SOURCES_LINALG})
 
 GET_SOURCE_FILES(SOURCES_LINALG_DENSE LinAlg/Dense)
-set ( SOURCES ${SOURCES} ${SOURCES_LINALG_DENSE})
+set(SOURCES ${SOURCES} ${SOURCES_LINALG_DENSE})
 
 GET_SOURCE_FILES(SOURCES_LINALG_SPARSE LinAlg/Sparse)
-set ( SOURCES ${SOURCES} ${SOURCES_LINALG_SPARSE})
+set(SOURCES ${SOURCES} ${SOURCES_LINALG_SPARSE})
 
 GET_SOURCE_FILES(SOURCES_LINALG_SOLVERS LinAlg/Solvers)
-set ( SOURCES ${SOURCES} ${SOURCES_LINALG_SOLVERS})
+set(SOURCES ${SOURCES} ${SOURCES_LINALG_SOLVERS})
 
 GET_SOURCE_FILES(SOURCES_LINALG_PRECOND LinAlg/Preconditioner)
-set ( SOURCES ${SOURCES} ${SOURCES_LINALG_PRECOND})
+set(SOURCES ${SOURCES} ${SOURCES_LINALG_PRECOND})
 
-if (OGS_USE_LIS)
+if(OGS_USE_LIS)
     GET_SOURCE_FILES(SOURCES_LINALG_LIS LinAlg/Lis)
-    set ( SOURCES ${SOURCES} ${SOURCES_LINALG_LIS})
-endif ()
+    set(SOURCES ${SOURCES} ${SOURCES_LINALG_LIS})
+endif()
 
-if (OGS_USE_PETSC)
+if(OGS_USE_PETSC)
     GET_SOURCE_FILES(SOURCES_LINALG_PETSC LinAlg/PETSc)
-    set ( SOURCES ${SOURCES} ${SOURCES_LINALG_PETSC})
-endif ()
+    set(SOURCES ${SOURCES} ${SOURCES_LINALG_PETSC})
+endif()
 
-if (METIS_FOUND)
+if(METIS_FOUND)
 	GET_SOURCE_FILES(SOURCES_LINALG_SPARSE_NESTEDDISSECTION LinAlg/Sparse/NestedDissectionPermutation)
-	set ( SOURCES ${SOURCES} ${SOURCES_LINALG_SPARSE_NESTEDDISSECTION})
+	set(SOURCES ${SOURCES} ${SOURCES_LINALG_SPARSE_NESTEDDISSECTION})
 endif ()
 
 GET_SOURCE_FILES(SOURCES_NONLINEAR Nonlinear)
-set ( SOURCES ${SOURCES} ${SOURCES_NONLINEAR})
+set(SOURCES ${SOURCES} ${SOURCES_NONLINEAR})
 
-include_directories (
+include_directories(
 	.
 	../BaseLib
 	../GeoLib
 )
 
 if(METIS_FOUND)
-	include_directories (
-		${METIS_INCLUDE_DIR}
-	)
+	include_directories(${METIS_INCLUDE_DIR})
 endif()
 
-if (OGS_USE_PETSC)
-    include_directories ( LinAlg/PETSc )   
+if(OGS_USE_PETSC)
+    include_directories(LinAlg/PETSc)
 
     GET_SOURCE_FILES(SOURCES_LINALG_PETSC LinAlg/PETSc)
-    set ( SOURCES ${SOURCES} ${SOURCES_LINALG_PETSC})
-endif ()
+    set(SOURCES ${SOURCES} ${SOURCES_LINALG_PETSC})
+endif()
 
 
 # Create the library
-add_library( MathLib STATIC ${SOURCES} )
+add_library(MathLib STATIC ${SOURCES})
 
 set_target_properties(MathLib PROPERTIES LINKER_LANGUAGE CXX)
 
-target_link_libraries ( MathLib 
+target_link_libraries(MathLib
 	GeoLib
 )
 
-if (LAPACK_FOUND)
-    target_link_libraries ( MathLib ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
+if(LAPACK_FOUND)
+    target_link_libraries(MathLib ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
 endif()
 
 if (LIS_FOUND)
-    target_link_libraries( MathLib ${LIS_LIBRARIES} )
+    target_link_libraries(MathLib ${LIS_LIBRARIES})
 endif()
 
diff --git a/MeshGeoToolsLib/CMakeLists.txt b/MeshGeoToolsLib/CMakeLists.txt
index 5eed23c2bec..76c8ffb69a4 100644
--- a/MeshGeoToolsLib/CMakeLists.txt
+++ b/MeshGeoToolsLib/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
 )
 
-target_link_libraries (MeshGeoToolsLib
+target_link_libraries(MeshGeoToolsLib
 	BaseLib
 	MathLib
 	MeshLib
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index 9b6a91435bb..9dc3022c12c 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -10,12 +10,12 @@ GET_SOURCE_FILES(SOURCES_ELEMENTS Elements)
 GET_SOURCE_FILES(SOURCES_EDITING MeshEditing)
 GET_SOURCE_FILES(SOURCES_GENERATORS MeshGenerators)
 GET_SOURCE_FILES(SOURCES_QUALITY MeshQuality)
-set ( SOURCES ${SOURCES_MESHLIB} ${SOURCES_ELEMENTS} ${SOURCES_EDITING} ${SOURCES_GENERATORS} ${SOURCES_QUALITY})
+set(SOURCES ${SOURCES_MESHLIB} ${SOURCES_ELEMENTS} ${SOURCES_EDITING} ${SOURCES_GENERATORS} ${SOURCES_QUALITY})
 
 # Create the library
 add_library(MeshLib STATIC ${SOURCES})
 
-target_link_libraries (MeshLib
+target_link_libraries(MeshLib
 	BaseLib
 	GeoLib
 	MathLib
diff --git a/NumLib/CMakeLists.txt b/NumLib/CMakeLists.txt
index 49d484c987d..6f25ae3e356 100644
--- a/NumLib/CMakeLists.txt
+++ b/NumLib/CMakeLists.txt
@@ -1,29 +1,29 @@
 #Source files grouped by a directory
 GET_SOURCE_FILES(SOURCES_NUMLIB)
-set ( SOURCES ${SOURCES_NUMLIB})
+set(SOURCES ${SOURCES_NUMLIB})
 
 GET_SOURCE_FILES(SOURCES_FEM Fem)
-set ( SOURCES ${SOURCES} ${SOURCES_FEM})
+set(SOURCES ${SOURCES} ${SOURCES_FEM})
 GET_SOURCE_FILES(SOURCES_FEM_COORDINATESMAPPING Fem/CoordinatesMapping)
-set ( SOURCES ${SOURCES} ${SOURCES_FEM_COORDINATESMAPPING})
+set(SOURCES ${SOURCES} ${SOURCES_FEM_COORDINATESMAPPING})
 GET_SOURCE_FILES(SOURCES_FEM_FINTIEELEMENT Fem/FiniteElement)
-set ( SOURCES ${SOURCES} ${SOURCES_FEM_FINTIEELEMENT})
+set(SOURCES ${SOURCES} ${SOURCES_FEM_FINTIEELEMENT})
 GET_SOURCE_FILES(SOURCES_FEM_INTEGRATION Fem/Integration)
-set ( SOURCES ${SOURCES} ${SOURCES_FEM_INTEGRATION})
+set(SOURCES ${SOURCES} ${SOURCES_FEM_INTEGRATION})
 GET_SOURCE_FILES(SOURCES_FEM_SHAPEFUNCTION Fem/ShapeFunction)
-set ( SOURCES ${SOURCES} ${SOURCES_FEM_SHAPEFUNCTION})
+set(SOURCES ${SOURCES} ${SOURCES_FEM_SHAPEFUNCTION})
 
 GET_SOURCE_FILES(SOURCES_TIMESTEP TimeStepping)
 GET_SOURCE_FILES(SOURCES_TIMESTEP_ALGORITHMS TimeStepping/Algorithms)
-set ( SOURCES ${SOURCES} ${SOURCES_TIMESTEP} ${SOURCES_TIMESTEP_ALGORITHMS})
+set(SOURCES ${SOURCES} ${SOURCES_TIMESTEP} ${SOURCES_TIMESTEP_ALGORITHMS})
 
 GET_SOURCE_FILES(SOURCES_FUNCTION Function)
-set ( SOURCES ${SOURCES} ${SOURCES_FUNCTION})
+set(SOURCES ${SOURCES} ${SOURCES_FUNCTION})
 GET_SOURCE_FILES(SOURCES_DISTRIBUTION Distribution)
-set ( SOURCES ${SOURCES} ${SOURCES_DISTRIBUTION})
+set(SOURCES ${SOURCES} ${SOURCES_DISTRIBUTION})
 
 
-include_directories (
+include_directories(
 	.
 	${CMAKE_CURRENT_SOURCE_DIR}/../BaseLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
@@ -34,11 +34,11 @@ include_directories (
 
 
 # Create the library
-add_library( NumLib STATIC ${SOURCES} )
+add_library(NumLib STATIC ${SOURCES})
 
 set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX)
 
-target_link_libraries ( NumLib 
+target_link_libraries(NumLib
 	BaseLib
 	GeoLib
 	MathLib
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index b6802e42745..552480006cb 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -3,7 +3,7 @@ GET_SOURCE_FILES(SOURCES)
 
 add_library(ProcessLib STATIC ${SOURCES})
 
-target_link_libraries( ProcessLib
+target_link_libraries(ProcessLib
     AssemblerLib
     MeshLib
     MeshGeoToolsLib
diff --git a/SimpleTests/MatrixTests/CMakeLists.txt b/SimpleTests/MatrixTests/CMakeLists.txt
index b07fac5017b..3962f976a9c 100644
--- a/SimpleTests/MatrixTests/CMakeLists.txt
+++ b/SimpleTests/MatrixTests/CMakeLists.txt
@@ -1,62 +1,72 @@
 ## pthread ##
-if (WIN32)
-	set ( ADDITIONAL_LIBS Winmm.lib )
+if(WIN32)
+	set(ADDITIONAL_LIBS Winmm.lib)
 endif()
 
-if ( CMAKE_USE_PTHREADS_INIT )
-        set (HAVE_PTHREADS TRUE)
-endif ()
+if(CMAKE_USE_PTHREADS_INIT)
+	set(HAVE_PTHREADS TRUE)
+endif()
 
 include_directories(
-        .
+	.
 	${CMAKE_SOURCE_DIR}/BaseLib/
 	${CMAKE_BINARY_DIR}/BaseLib/
 	${CMAKE_SOURCE_DIR}/MathLib/
 )
 
 # Create the executable
-add_executable( MatMult
-        MatMult.cpp
-        ${SOURCES}
-        ${HEADERS}
+add_executable(MatMult
+	MatMult.cpp
+	${SOURCES}
+	${HEADERS}
 )
 set_target_properties(MatMult PROPERTIES FOLDER SimpleTests)
 target_link_libraries(MatMult logog)
 
-if ( HAVE_PTHREADS )
-add_executable( MatVecMultPthreads
-        MatVecMultPthreads.cpp
-        ${SOURCES}
-        ${HEADERS}
-)
-set_target_properties(MatVecMultPthreads PROPERTIES FOLDER SimpleTests)
-target_link_libraries(MatVecMultPthreads
-	pthread
-	BaseLib
-	MathLib
-	logog)
-endif ()
+if(HAVE_PTHREADS)
+	add_executable(MatVecMultPthreads
+		MatVecMultPthreads.cpp
+		${SOURCES}
+		${HEADERS}
+	)
+	set_target_properties(MatVecMultPthreads PROPERTIES FOLDER SimpleTests)
+	target_link_libraries(MatVecMultPthreads
+		pthread
+		BaseLib
+		MathLib
+		logog
+	)
+endif()
 
 set_target_properties(MatMult PROPERTIES FOLDER SimpleTests)
-target_link_libraries(MatMult logog)
+target_link_libraries(MatMult
+	logog
+	BaseLib
+	MathLib
+	${ADDITIONAL_LIBS}
+)
 
-# Create the executable
-add_executable( MatTestRemoveRowsCols
-        MatTestRemoveRowsCols.cpp
-        ${SOURCES}
-        ${HEADERS}
+add_executable(MatTestRemoveRowsCols
+	MatTestRemoveRowsCols.cpp
+	${SOURCES}
+	${HEADERS}
 )
 set_target_properties(MatTestRemoveRowsCols PROPERTIES FOLDER SimpleTests)
+target_link_libraries(MatTestRemoveRowsCols
+	BaseLib
+	MathLib
+	${ADDITIONAL_LIBS}
+)
 
-if (METIS_FOUND)
-	add_executable( MatVecMultNDPerm
-        	MatVecMultNDPerm.cpp
-	        ${SOURCES}
-        	${HEADERS}
+if(METIS_FOUND)
+	add_executable(MatVecMultNDPerm
+		MatVecMultNDPerm.cpp
+		${SOURCES}
+		${HEADERS}
 	)
 	set_target_properties(MatVecMultNDPerm PROPERTIES FOLDER SimpleTests)
 
-	target_link_libraries ( MatVecMultNDPerm
+	target_link_libraries(MatVecMultNDPerm
 		BaseLib
 		MathLib
 		logog
@@ -65,14 +75,14 @@ if (METIS_FOUND)
 	)
 
 	if(OPENMP_FOUND)
-		add_executable( MatVecMultNDPermOpenMP
+		add_executable(MatVecMultNDPermOpenMP
 			MatVecMultNDPermOpenMP.cpp
 			${SOURCES}
 			${HEADERS}
 		)
 		set_target_properties(MatVecMultNDPermOpenMP PROPERTIES FOLDER SimpleTests)
 
-		target_link_libraries ( MatVecMultNDPermOpenMP
+		target_link_libraries(MatVecMultNDPermOpenMP
 			BaseLib
 			MathLib
 			logog
@@ -82,29 +92,10 @@ if (METIS_FOUND)
 	endif()
 endif()
 
-
-if (WIN32)
-        target_link_libraries(MatMult Winmm.lib)
-endif ()
-
-target_link_libraries ( MatMult
-	BaseLib
-	MathLib
-)
-
-if (WIN32)
-        target_link_libraries(MatTestRemoveRowsCols Winmm.lib)
-endif ()
-
-target_link_libraries ( MatTestRemoveRowsCols
-	BaseLib
-	MathLib
-)
-
-add_executable( DenseGaussEliminationChecker
-        DenseGaussEliminationChecker.cpp
-        ${SOURCES}
-        ${HEADERS}
+add_executable(DenseGaussEliminationChecker
+	DenseGaussEliminationChecker.cpp
+	${SOURCES}
+	${HEADERS}
 )
 set_target_properties(DenseGaussEliminationChecker PROPERTIES FOLDER SimpleTests)
 target_link_libraries(DenseGaussEliminationChecker
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index 1b6efb0001e..67ed2b6cd8e 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -1,5 +1,5 @@
-if (WIN32)
-	set ( ADDITIONAL_LIBS Winmm.lib )
+if(WIN32)
+	set(ADDITIONAL_LIBS Winmm.lib)
 endif()
 
 include_directories(
@@ -12,13 +12,13 @@ include_directories(
 )
 
 # Create the executable
-add_executable( MeshRead
+add_executable(MeshRead
 	MeshRead.cpp
 	${SOURCES}
 	${HEADERS}
 )
 
-target_link_libraries ( MeshRead
+target_link_libraries(MeshRead
 	MeshLib
 	FileIO
 	MathLib
@@ -31,13 +31,13 @@ target_link_libraries ( MeshRead
 )
 
 # Create MeshSearchTest executable
-add_executable( MeshSearchTest
+add_executable(MeshSearchTest
 	MeshSearchTest.cpp
 	${SOURCES}
 	${HEADERS}
 )
 
-target_link_libraries ( MeshSearchTest
+target_link_libraries(MeshSearchTest
 	MeshLib
 	FileIO
 	MathLib
diff --git a/SimpleTests/MeshTests/MPI/CMakeLists.txt b/SimpleTests/MeshTests/MPI/CMakeLists.txt
index 3638647cb84..e441cf53769 100644
--- a/SimpleTests/MeshTests/MPI/CMakeLists.txt
+++ b/SimpleTests/MeshTests/MPI/CMakeLists.txt
@@ -5,12 +5,11 @@ include_directories(
 	${CMAKE_SOURCE_DIR}/MeshLib/
 )
 
-# Create the executable
-add_executable( test_node_partitioned_mesh
+add_executable(test_node_partitioned_mesh
 	NodePartitionedMeshTester.cpp
 )
 
-target_link_libraries ( test_node_partitioned_mesh
+target_link_libraries(test_node_partitioned_mesh
 	MeshLib
 	FileIO
 	BaseLib
@@ -19,20 +18,20 @@ target_link_libraries ( test_node_partitioned_mesh
 	${BOOST_LIBRARIES}
 )
 
-if (OGS_USE_PETSC)
-	target_link_libraries( test_node_partitioned_mesh  ${PETSC_LIBRARIES})
-endif ()
+if(OGS_USE_PETSC)
+	target_link_libraries(test_node_partitioned_mesh ${PETSC_LIBRARIES})
+endif()
 
-if (OGS_USE_MPI)
-	target_link_libraries( test_node_partitioned_mesh  ${MPI_CXX_LIBRARIES})
-endif ()
+if(OGS_USE_MPI)
+	target_link_libraries(test_node_partitioned_mesh ${MPI_CXX_LIBRARIES})
+endif()
 
 set(FilePath "DATA{${ExternalData_SOURCE_ROOT}/NodePartitionedMesh/ASCII/,REGEX:.*}")
 set(MPITestParameters -np 3 "${PROJECT_BINARY_DIR}/bin/test_node_partitioned_mesh" "${FilePath}/mesh_3d")
 ExternalData_Add_Test(
 	data
 	NAME NodePartitionedMeshTestASCII
-	COMMAND  "mpirun" ${MPITestParameters}
+	COMMAND "mpirun" ${MPITestParameters}
 )
 
 set(FilePath "DATA{${ExternalData_SOURCE_ROOT}/NodePartitionedMesh/Binary/,REGEX:.*}")
@@ -42,4 +41,3 @@ ExternalData_Add_Test(
 	NAME NodePartitionedMeshTestBinary
 	COMMAND  "mpirun" ${MPITestParameters}
 )
-
diff --git a/SimpleTests/SolverTests/CMakeLists.txt b/SimpleTests/SolverTests/CMakeLists.txt
index f75e110e902..0ec1427aa71 100644
--- a/SimpleTests/SolverTests/CMakeLists.txt
+++ b/SimpleTests/SolverTests/CMakeLists.txt
@@ -1,76 +1,69 @@
+if(WIN32)
+	set(ADDITIONAL_LIBS Winmm.lib)
+endif()
+
 include_directories(
-        .
+	.
 	../../BaseLib/
 	../../MathLib/
 )
 
-# Create the executable
-add_executable( ConjugateGradientUnpreconditioned
-        ConjugateGradientUnpreconditioned.cpp
-        ${SOURCES}
-        ${HEADERS}
+add_executable(ConjugateGradientUnpreconditioned
+	ConjugateGradientUnpreconditioned.cpp
+	${SOURCES}
+	${HEADERS}
 )
 set_target_properties(ConjugateGradientUnpreconditioned PROPERTIES FOLDER SimpleTests)
 
-add_executable( ConjugateGradientDiagPrecond
-        ConjugateGradientDiagonalPreconditioned.cpp
-        ${SOURCES}
-        ${HEADERS}
+add_executable(ConjugateGradientDiagPrecond
+	ConjugateGradientDiagonalPreconditioned.cpp
+	${SOURCES}
+	${HEADERS}
 )
 set_target_properties(ConjugateGradientDiagPrecond PROPERTIES FOLDER SimpleTests)
 
-add_executable( BiCGStabDiagPrecond
+add_executable(BiCGStabDiagPrecond
 	BiCGStabDiagPrecond.cpp
-        ${SOURCES}
-        ${HEADERS}
+	${SOURCES}
+	${HEADERS}
 )
 set_target_properties(BiCGStabDiagPrecond PROPERTIES FOLDER SimpleTests)
 
-add_executable( GMResDiagPrecond
+add_executable(GMResDiagPrecond
 	GMResDiagPrecond.cpp
-        ${SOURCES}
-        ${HEADERS}
+	${SOURCES}
+	${HEADERS}
 )
 set_target_properties(GMResDiagPrecond PROPERTIES FOLDER SimpleTests)
 
-
-if (WIN32)
-        target_link_libraries(ConjugateGradientUnpreconditioned Winmm.lib)
-endif ()
-target_link_libraries ( ConjugateGradientUnpreconditioned
-        ${BLAS_LIBRARIES}
-        ${LAPACK_LIBRARIES}
+target_link_libraries(ConjugateGradientUnpreconditioned
+	${BLAS_LIBRARIES}
+	${LAPACK_LIBRARIES}
+	${ADDITIONAL_LIBS}
 	MathLib
 	BaseLib
 )
 
-if (WIN32)
-        target_link_libraries(ConjugateGradientDiagPrecond Winmm.lib)
-endif ()
-target_link_libraries ( ConjugateGradientDiagPrecond
-        ${BLAS_LIBRARIES}
-        ${LAPACK_LIBRARIES}
+target_link_libraries(ConjugateGradientDiagPrecond
+	${BLAS_LIBRARIES}
+	${LAPACK_LIBRARIES}
+	${ADDITIONAL_LIBS}
 	MathLib
 	BaseLib
 )
 
-if (WIN32)
-        target_link_libraries(BiCGStabDiagPrecond Winmm.lib)
-endif ()
-target_link_libraries( BiCGStabDiagPrecond
-        ${BLAS_LIBRARIES}
-        ${LAPACK_LIBRARIES}
+target_link_libraries(BiCGStabDiagPrecond
+	${BLAS_LIBRARIES}
+	${LAPACK_LIBRARIES}
+	${ADDITIONAL_LIBS}
 	MathLib
 	BaseLib
 )
 
-if (WIN32)
-        target_link_libraries(GMResDiagPrecond Winmm.lib)
-endif ()
-target_link_libraries( GMResDiagPrecond
-        ${BLAS_LIBRARIES}
-        ${LAPACK_LIBRARIES}
+target_link_libraries(GMResDiagPrecond
+	${BLAS_LIBRARIES}
+	${LAPACK_LIBRARIES}
+	${ADDITIONAL_LIBS}
 	MathLib
 	BaseLib
 )
-
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cc40706af31..6e0b91de500 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 # VS2012 doesn't support correctly the tuples yet
 # See http://code.google.com/p/googletest/issues/detail?id=412
-if( MSVC )
-	add_definitions( /D_VARIADIC_MAX=10 )
+if(MSVC)
+	add_definitions(/D_VARIADIC_MAX=10)
 endif()
 
 APPEND_SOURCE_FILES(TEST_SOURCES)
@@ -13,9 +13,9 @@ APPEND_SOURCE_FILES(TEST_SOURCES MathLib)
 APPEND_SOURCE_FILES(TEST_SOURCES MeshLib)
 APPEND_SOURCE_FILES(TEST_SOURCES NumLib)
 
-set (TEST_SOURCES ${TEST_SOURCES} FileIO/TestGLIReader.cpp)
-if (QT4_FOUND)
-	set (TEST_SOURCES ${TEST_SOURCES} FileIO/TestXmlGmlReader.cpp)
+set(TEST_SOURCES ${TEST_SOURCES} FileIO/TestGLIReader.cpp)
+if(QT4_FOUND)
+	set(TEST_SOURCES ${TEST_SOURCES} FileIO/TestXmlGmlReader.cpp)
 endif()
 
 include_directories(
@@ -31,7 +31,7 @@ include_directories(
 	${CMAKE_BINARY_DIR}/BaseLib
 )
 
-add_executable (testrunner testrunner.cpp ${TEST_SOURCES})
+add_executable(testrunner testrunner.cpp ${TEST_SOURCES})
 set_target_properties(testrunner PROPERTIES FOLDER Testing)
 if(TARGET Eigen)
 	add_dependencies(testrunner Eigen)
@@ -55,13 +55,13 @@ target_link_libraries(testrunner
 	${CATALYST_LIBRARIES}
 )
 ADD_CATALYST_DEPENDENCY(testrunner)
-if (OGS_USE_PETSC)
-	target_link_libraries( testrunner  ${PETSC_LIBRARIES})
-endif ()
+if(OGS_USE_PETSC)
+	target_link_libraries(testrunner ${PETSC_LIBRARIES})
+endif()
 
-if (OGS_USE_MPI)
-	target_link_libraries( testrunner  ${MPI_CXX_LIBRARIES})
-endif ()
+if(OGS_USE_MPI)
+	target_link_libraries(testrunner ${MPI_CXX_LIBRARIES})
+endif()
 
 if(OGS_BUILD_GUI)
 	target_link_libraries(testrunner
@@ -70,7 +70,7 @@ if(OGS_BUILD_GUI)
 	)
 endif()
 
-if (QT4_FOUND)
+if(QT4_FOUND)
 	target_link_libraries(testrunner ${QT_LIBRARIES})
 endif()
 
@@ -79,7 +79,7 @@ ADD_CATALYST_DEPENDENCY(testrunner)
 
 # Add make-target test which runs the testrunner
 # This should override CTest's predefined test-target but it does not
-if (OGS_USE_PETSC)
+if(OGS_USE_PETSC)
 	add_custom_target(tests
 		mpirun -np 1 $<TARGET_FILE:testrunner> --gtest_filter=-MPITest*
 		DEPENDS testrunner
@@ -88,15 +88,12 @@ if (OGS_USE_PETSC)
 		mpirun -np 3 $<TARGET_FILE:testrunner>  --gtest_filter=MPITest*
 		DEPENDS testrunner
 	)
-else ()
+else()
 	add_custom_target(tests
 		$<TARGET_FILE:testrunner>
 		DEPENDS testrunner
 	)
-endif ()
-
-# Testing
-#enable_testing()
+endif()
 
 # Creates one ctest entry for every googletest
 #ADD_GOOGLE_TESTS ( ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/testrunner ${TEST_SOURCES})
diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index db2b5eaff86..6be6902ce56 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -7,15 +7,15 @@ set(CMAKE_OSX_ARCHITECTURES "x86_64")
 
 # Set compiler helper variables
 
-if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     set(COMPILER_IS_CLANG TRUE)
-elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
     set(COMPILER_IS_GCC TRUE)
-elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
     set(COMPILER_IS_INTEL TRUE)
-elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
     set(COMPILER_IS_MSVC TRUE)
-endif () # CMAKE_CXX_COMPILER_ID
+endif() # CMAKE_CXX_COMPILER_ID
 
 # Better Clang warning suppression, see http://www.openwalnut.org/issues/230
 if(NOT COMPILER_IS_MSVC)
@@ -27,19 +27,19 @@ set(CMAKE_CXX_FLAGS ${OGS_CXX_FLAGS})
 
 ### GNU C/CXX compiler
 if(COMPILER_IS_GCC)
-		get_gcc_version(GCC_VERSION)
-		if(GCC_VERSION VERSION_LESS "4.8")
-			message(FATAL_ERROR "GCC minimum required version is 4.8! You are using ${GCC_VERSION}.")
-		endif()
-		if( NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
-				message(STATUS "Set GCC release flags")
-				set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mtune=native -msse4.2 -DNDEBUG")
-				# Disable -march=native on mac or Ninja generator
-				if(NOT APPLE AND NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
-					set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-				endif()
+	get_gcc_version(GCC_VERSION)
+	if(GCC_VERSION VERSION_LESS "4.8")
+		message(FATAL_ERROR "GCC minimum required version is 4.8! You are using ${GCC_VERSION}.")
+	endif()
+	if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+		message(STATUS "Set GCC release flags")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mtune=native -msse4.2 -DNDEBUG")
+		# Disable -march=native on mac or Ninja generator
+		if(NOT APPLE AND NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
 		endif()
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated -Wall -Wextra")
+	endif()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated -Wall -Wextra")
 endif() # COMPILER_IS_GCC
 
 ### Clang
@@ -51,18 +51,18 @@ if(COMPILER_IS_CLANG)
 endif() # COMPILER_IS_CLANG
 
 ### Intel compiler
-if (COMPILER_IS_INTEL)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-		if( NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
-				message(STATUS "Set Intel release flags")
-				set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG")
-		endif()
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHOST -O3 -no-prec-div -DNDEBUG")
+if(COMPILER_IS_INTEL)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+	if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+		message(STATUS "Set Intel release flags")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG")
+	endif()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHOST -O3 -no-prec-div -DNDEBUG")
 endif() # COMPILER_IS_INTEL
 
 # Profiling
-if (OGS_PROFILE)
-	if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
+if(OGS_PROFILE)
+	if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
 		message(STATUS "When using profiling you should set CMAKE_BUILD_TYPE to Release.")
 	endif()
 	set(PROFILE_FLAGS "-pg -fno-omit-frame-pointer -O2 -DNDEBUG")
@@ -90,10 +90,10 @@ if (WIN32)
 
 		DisableCompilerFlag(DEBUG /RTC1)
 	# cygwin
-	else ()
+	else()
 		message (STATUS "Might be GCC under cygwin.")
 		add_definitions( -DGCC )
-	endif ()
+	endif()
 endif ()
 
 # Missing OpenMP 3.0 implementation fix for Windows, this fixes #6
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 2a603873cf1..90aab4143d1 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -85,7 +85,7 @@ if(NOT OGS_DONT_USE_QT)
 	find_package( Qt4 4.7)
 endif()
 
-if ( QT4_FOUND )
+if(QT4_FOUND)
 	# Enable more modules
 	set(QT_USE_QTOPENGL TRUE)
 	set(QT_USE_QTSQL TRUE)
@@ -94,24 +94,21 @@ if ( QT4_FOUND )
 	set(QT_USE_QTXMLPATTERNS TRUE)
 	include( ${QT_USE_FILE} )
 	add_definitions(${QT_DEFINITIONS} -DQT4_FOUND)
-endif ()
+endif()
 
 ## pthread ##
-set ( CMAKE_THREAD_PREFER_PTHREAD ON )
-find_package ( Threads )
-if ( CMAKE_USE_PTHREADS_INIT )
-	set (HAVE_PTHREADS TRUE)
+set(CMAKE_THREAD_PREFER_PTHREAD ON)
+find_package(Threads)
+if(CMAKE_USE_PTHREADS_INIT)
+	set(HAVE_PTHREADS TRUE)
 	add_definitions(-DHAVE_PTHREADS)
-endif ()
-
-# blas
-#find_package ( BLAS QUIET )
+endif()
 
 # lapack
-find_package ( LAPACK QUIET )
+find_package(LAPACK QUIET)
 
 ## geotiff ##
-find_package( LibGeoTiff )
+find_package(LibGeoTiff)
 if(GEOTIFF_FOUND)
 	add_definitions(-DGEOTIFF_FOUND)
 endif() # GEOTIFF_FOUND
@@ -122,28 +119,28 @@ if(OGS_USE_LIS)
 endif()
 
 if(OGS_USE_PETSC)
-    message (STATUS  "Configuring for PETSc" )
+	message(STATUS "Configuring for PETSc")
 
-    option(FORCE_PETSC_EXECUTABLE_RUNS "Force CMake to accept a given PETSc configuration" ON)
+	option(FORCE_PETSC_EXECUTABLE_RUNS "Force CMake to accept a given PETSc configuration" ON)
 
-    ##Force CMake to accept a given PETSc configuration in case the failure of MPI tests
-    ##This may cause the compilation broken.
-    if(FORCE_PETSC_EXECUTABLE_RUNS)
-        set(PETSC_EXECUTABLE_RUNS YES)
-    endif()
+	##Force CMake to accept a given PETSc configuration in case the failure of MPI tests
+	##This may cause the compilation broken.
+	if(FORCE_PETSC_EXECUTABLE_RUNS)
+		set(PETSC_EXECUTABLE_RUNS YES)
+	endif()
 
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/scripts/cmake/findPETSC")
-    find_package(PETSc REQUIRED)
+	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/scripts/cmake/findPETSC")
+	find_package(PETSc REQUIRED)
 
-    include_directories(SYSTEM ${PETSC_INCLUDES})
+	include_directories(SYSTEM ${PETSC_INCLUDES})
 
-    add_definitions(-DPETSC_VERSION_NUMBER=PETSC_VERSION_MAJOR*1000+PETSC_VERSION_MINOR*10)
+	add_definitions(-DPETSC_VERSION_NUMBER=PETSC_VERSION_MAJOR*1000+PETSC_VERSION_MINOR*10)
 
 endif()
 
 ## Check MPI package
 if(OGS_USE_MPI)
-    find_package(MPI REQUIRED)
-    include_directories(SYSTEM ${MPI_CXX_INCLUDE_PATH})
+	find_package(MPI REQUIRED)
+	include_directories(SYSTEM ${MPI_CXX_INCLUDE_PATH})
 endif()
 
diff --git a/scripts/cmake/Functions.cmake b/scripts/cmake/Functions.cmake
index fdeab6ff1ba..bea58f47651 100644
--- a/scripts/cmake/Functions.cmake
+++ b/scripts/cmake/Functions.cmake
@@ -30,7 +30,7 @@ macro(GET_SOURCE_FILES SOURCE_FILES)
 	endif()
 
 	GET_CURRENT_SOURCE_SUBDIRECTORY(DIRECTORY)
-	source_group( "${DIRECTORY}${DIR}" FILES
+	source_group("${DIRECTORY}${DIR}" FILES
 		${GET_SOURCE_FILES_HEADERS}
 		${GET_SOURCE_FILES_SOURCES}
 		${GET_SOURCE_FILES_TEMPLATES})
@@ -47,13 +47,12 @@ endmacro()
 # Creates one ctest for each googletest found in source files passed as arguments
 # number two onwards. Argument one specifies the testrunner executable.
 macro(ADD_GOOGLE_TESTS executable)
-	foreach ( source ${ARGN} )
+	foreach(source ${ARGN})
 		file(READ "${source}" contents)
 		string(REGEX MATCHALL "TEST_?F?\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
 		foreach(hit ${found_tests})
 			string(REGEX REPLACE ".*\\(([A-Za-z_0-9]+)[, ]*([A-Za-z_0-9]+)\\).*" "\\1.\\2" test_name ${hit})
 			add_test(${test_name} ${executable}  --gtest_output=xml --gtest_filter=${test_name} ${MI3CTestingDir})
-			# message ("Adding test: ${test_name}")
 		endforeach()
 	endforeach()
 endmacro()
diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake
index d9b38cd0e20..25b4ff328c9 100644
--- a/scripts/cmake/ProjectSetup.cmake
+++ b/scripts/cmake/ProjectSetup.cmake
@@ -1,6 +1,6 @@
 # Set build directories
-set( EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin )
-set( LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib )
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 
 # Logging level
 if(OGS_DISABLE_LOGGING)
@@ -20,7 +20,7 @@ endif() # NOT DEFINED OGS_LOG_LEVEL
 # Enable Visual Studio project folder grouping
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 # Check if this project is included in another
 if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-- 
GitLab