diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69cfd82ba..d973266b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -613,3 +613,7 @@ add_definitions(
 )
 
 add_subdirectory(base)
+add_subdirectory(prec)
+add_subdirectory(krylov)
+add_subdirectory(util)
+#add_subdirectory(cbind)
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 44859d5ef..723aa533d 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -442,10 +442,12 @@ serial/impl/psb_c_mat_impl.F90
 serial/impl/psb_s_base_mat_impl.F90
 serial/impl/psb_d_mat_impl.F90
 serial/impl/psb_z_base_mat_impl.F90
-modules/fakempi.c
 modules/cutil.c
 )
 
+# Add this above and below if the SERIAL_MPI flag is passed:
+# modules/fakempi.c
+
 add_library(base_static STATIC
 internals/psi_desc_impl.f90
 internals/psi_crea_bnd_elem.f90
@@ -803,7 +805,6 @@ serial/impl/psb_c_mat_impl.F90
 serial/impl/psb_s_base_mat_impl.F90
 serial/impl/psb_d_mat_impl.F90
 serial/impl/psb_z_base_mat_impl.F90
-modules/fakempi.c
 modules/cutil.c
 )
 target_link_libraries(base PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES})
diff --git a/krylov/CMakeLists.txt b/krylov/CMakeLists.txt
new file mode 100644
index 000000000..78e52f4b1
--- /dev/null
+++ b/krylov/CMakeLists.txt
@@ -0,0 +1,206 @@
+if (NOT MPI_C_FOUND)
+  find_package(MPI REQUIRED)
+
+  set(CMAKE_C_COMPILE_FLAGS ${CMAKE_C_COMPILE_FLAGS} ${MPI_C_COMPILE_FLAGS})
+  set(CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS} ${MPI_C_LINK_FLAGS})
+  set(CMAKE_Fortran_COMPILE_FLAGS ${CMAKE_Fortran_COMPILE_FLAGS} ${MPI_Fortran_COMPILE_FLAGS})
+  set(CMAKE_Fortran_LINK_FLAGS ${CMAKE_Fortran_LINK_FLAGS} ${MPI_Fortran_LINK_FLAGS})
+  include_directories(BEFORE ${MPI_C_INCLUDE_PATH} ${MPI_Fortran_INCLUDE_PATH})
+endif()
+
+if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
+  set(gfortran_compiler true)
+endif()
+
+include(CheckIncludeFile)
+CHECK_INCLUDE_FILE("alloca.h" HAVE_ALLOCA)
+if(NOT HAVE_ALLOCA)
+  add_definitions(-DALLOCA_MISSING)
+  message(WARNING "Could not find <alloca.h>. Assuming functionality is provided elsewhere.")
+endif()
+
+set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
+if(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${MPI_C_INCLUDE_PATH})
+else()
+  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
+endif()
+set(old_cmake_required_flags "${CMAKE_REQUIRED_FLAGS}")
+if(CMAKE_REQUIRED_FLAGS)
+  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS};${MPI_C_COMPILE_FLAGS};${MPI_C_LINK_FLAGS})
+else()
+  set(CMAKE_REQUIRED_FLAGS ${MPI_C_COMPILE_FLAGS};${MPI_C_LINK_FLAGS})
+endif()
+set(old_cmake_required_libraries "${CMAKE_REQUIRED_LIBRARIES}")
+if(CMAKE_REQUIRED_LIBRARIES)
+  set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES};${MPI_C_LIBRARIES})
+else()
+  set(CMAKE_REQUIRED_LIBRARIES ${MPI_C_LIBRARIES})
+endif()
+
+set(MPI_HEADERS mpi.h)
+include(CheckIncludeFiles)
+CHECK_INCLUDE_FILES("mpi.h;mpi-ext.h" HAVE_MPI_EXT)
+if(HAVE_MPI_EXT)
+  add_definitions(-DHAVE_MPI_EXT_H)
+  set(MPI_HEADERS ${MPI_HEADERS};mpi-ext.h)
+endif()
+
+set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
+set(CMAKE_REQUIRED_FLAGS ${old_cmake_required_flags})
+set(CMAKE_REQUIRED_LIBRARIES ${old_cmake_required_libraries})
+
+#---------------------------------------------------
+# Windows Intel MPI compatibility, see GH issue #435
+#---------------------------------------------------
+set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
+if(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${MPI_C_INCLUDE_PATH})
+else()
+  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
+endif()
+CHECK_INCLUDE_FILES("mpi.h" HAVE_MPI_H)
+
+include(CheckSymbolExists)
+CHECK_SYMBOL_EXISTS(I_MPI_VERSION "mpi.h" HAVE_Intel_MPI)
+if(HAVE_Intel_MPI AND WIN32)
+  add_definitions(-DUSE_GCC)
+endif()
+set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
+
+set(PSBLAS_SO_VERSION 0)
+if(gfortran_compiler)
+  if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
+    set(PSBLAS_SO_VERSION 2)
+  elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0.0)
+    set(PSBLAS_SO_VERSION 1)
+  endif()
+endif()
+
+set(PSBLAS_MODDIR "${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}")
+set(MOD_DIR_FLAG "${CMAKE_Fortran_MODDIR_FLAG}")
+set(MPI_LIBS "")
+foreach( lib IN LISTS MPI_Fortran_LIBRARIES)
+  set(MPI_LIBS "${MPI_LIBS} \"${lib}\"")
+endforeach()
+string(STRIP "${MPI_LIBS}" MPI_LIBS)
+
+add_library(krylov SHARED
+psb_base_krylov_conv_mod.f90
+psb_cbicg.f90
+psb_ccg.F90
+psb_ccgs.f90
+psb_ccgstab.f90
+psb_ccgstabl.f90
+psb_cfcg.F90
+psb_cgcr.f90
+psb_c_krylov_conv_mod.f90
+psb_ckrylov.f90
+psb_crgmres.f90
+psb_dbicg.f90
+psb_dcg.F90
+psb_dcgs.f90
+psb_dcgstab.f90
+psb_dcgstabl.f90
+psb_dfcg.F90
+psb_dgcr.f90
+psb_d_krylov_conv_mod.f90
+psb_dkrylov.f90
+psb_drgmres.f90
+psb_krylov_conv_mod.f90
+psb_krylov_mod.f90
+psb_sbicg.f90
+psb_scg.F90
+psb_scgs.f90
+psb_scgstab.f90
+psb_scgstabl.f90
+psb_sfcg.F90
+psb_sgcr.f90
+psb_s_krylov_conv_mod.f90
+psb_skrylov.f90
+psb_srgmres.f90
+psb_zbicg.f90
+psb_zcg.F90
+psb_zcgs.f90
+psb_zcgstab.f90
+psb_zcgstabl.f90
+psb_zfcg.F90
+psb_zgcr.f90
+psb_z_krylov_conv_mod.f90
+psb_zkrylov.f90
+psb_zrgmres.f90
+)
+
+add_library(krylov_static STATIC
+psb_base_krylov_conv_mod.f90
+psb_cbicg.f90
+psb_ccg.F90
+psb_ccgs.f90
+psb_ccgstab.f90
+psb_ccgstabl.f90
+psb_cfcg.F90
+psb_cgcr.f90
+psb_c_krylov_conv_mod.f90
+psb_ckrylov.f90
+psb_crgmres.f90
+psb_dbicg.f90
+psb_dcg.F90
+psb_dcgs.f90
+psb_dcgstab.f90
+psb_dcgstabl.f90
+psb_dfcg.F90
+psb_dgcr.f90
+psb_d_krylov_conv_mod.f90
+psb_dkrylov.f90
+psb_drgmres.f90
+psb_krylov_conv_mod.f90
+psb_krylov_mod.f90
+psb_sbicg.f90
+psb_scg.F90
+psb_scgs.f90
+psb_scgstab.f90
+psb_scgstabl.f90
+psb_sfcg.F90
+psb_sgcr.f90
+psb_s_krylov_conv_mod.f90
+psb_skrylov.f90
+psb_srgmres.f90
+psb_zbicg.f90
+psb_zcg.F90
+psb_zcgs.f90
+psb_zcgstab.f90
+psb_zcgstabl.f90
+psb_zfcg.F90
+psb_zgcr.f90
+psb_z_krylov_conv_mod.f90
+psb_zkrylov.f90
+psb_zrgmres.f90
+)
+
+target_link_libraries(krylov PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} prec)
+target_link_libraries(krylov_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} prec)
+
+install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+  FILES_MATCHING PATTERN "*.mod")
+
+set_target_properties( krylov_static
+  PROPERTIES
+  SOVERSION ${PSBLAS_SO_VERSION}
+)
+set_target_properties ( krylov
+  PROPERTIES
+  SOVERSION ${PSBLAS_SO_VERSION}
+)
+set_target_properties(krylov_static PROPERTIES OUTPUT_NAME krylov)
+get_target_property(libkrylov_static krylov_static OUTPUT_NAME)
+set(PSBLAS_LIBS "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${libkrylov_static}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+install(TARGETS krylov EXPORT PSBLAS_Targets
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
+
+install(TARGETS krylov_static EXPORT PSBLAS_Targets
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
diff --git a/prec/CMakeLists.txt b/prec/CMakeLists.txt
new file mode 100644
index 000000000..d2d05b629
--- /dev/null
+++ b/prec/CMakeLists.txt
@@ -0,0 +1,237 @@
+if (NOT MPI_C_FOUND)
+  find_package(MPI REQUIRED)
+
+  set(CMAKE_C_COMPILE_FLAGS ${CMAKE_C_COMPILE_FLAGS} ${MPI_C_COMPILE_FLAGS})
+  set(CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS} ${MPI_C_LINK_FLAGS})
+  set(CMAKE_Fortran_COMPILE_FLAGS ${CMAKE_Fortran_COMPILE_FLAGS} ${MPI_Fortran_COMPILE_FLAGS})
+  set(CMAKE_Fortran_LINK_FLAGS ${CMAKE_Fortran_LINK_FLAGS} ${MPI_Fortran_LINK_FLAGS})
+  include_directories(BEFORE ${MPI_C_INCLUDE_PATH} ${MPI_Fortran_INCLUDE_PATH})
+endif()
+
+if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
+  set(gfortran_compiler true)
+endif()
+
+include(CheckIncludeFile)
+CHECK_INCLUDE_FILE("alloca.h" HAVE_ALLOCA)
+if(NOT HAVE_ALLOCA)
+  add_definitions(-DALLOCA_MISSING)
+  message(WARNING "Could not find <alloca.h>. Assuming functionality is provided elsewhere.")
+endif()
+
+set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
+if(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${MPI_C_INCLUDE_PATH})
+else()
+  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
+endif()
+set(old_cmake_required_flags "${CMAKE_REQUIRED_FLAGS}")
+if(CMAKE_REQUIRED_FLAGS)
+  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS};${MPI_C_COMPILE_FLAGS};${MPI_C_LINK_FLAGS})
+else()
+  set(CMAKE_REQUIRED_FLAGS ${MPI_C_COMPILE_FLAGS};${MPI_C_LINK_FLAGS})
+endif()
+set(old_cmake_required_libraries "${CMAKE_REQUIRED_LIBRARIES}")
+if(CMAKE_REQUIRED_LIBRARIES)
+  set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES};${MPI_C_LIBRARIES})
+else()
+  set(CMAKE_REQUIRED_LIBRARIES ${MPI_C_LIBRARIES})
+endif()
+
+set(MPI_HEADERS mpi.h)
+include(CheckIncludeFiles)
+CHECK_INCLUDE_FILES("mpi.h;mpi-ext.h" HAVE_MPI_EXT)
+if(HAVE_MPI_EXT)
+  add_definitions(-DHAVE_MPI_EXT_H)
+  set(MPI_HEADERS ${MPI_HEADERS};mpi-ext.h)
+endif()
+
+set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
+set(CMAKE_REQUIRED_FLAGS ${old_cmake_required_flags})
+set(CMAKE_REQUIRED_LIBRARIES ${old_cmake_required_libraries})
+
+#---------------------------------------------------
+# Windows Intel MPI compatibility, see GH issue #435
+#---------------------------------------------------
+set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
+if(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${MPI_C_INCLUDE_PATH})
+else()
+  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
+endif()
+CHECK_INCLUDE_FILES("mpi.h" HAVE_MPI_H)
+
+include(CheckSymbolExists)
+CHECK_SYMBOL_EXISTS(I_MPI_VERSION "mpi.h" HAVE_Intel_MPI)
+if(HAVE_Intel_MPI AND WIN32)
+  add_definitions(-DUSE_GCC)
+endif()
+set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
+
+set(PSBLAS_SO_VERSION 0)
+if(gfortran_compiler)
+  if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
+    set(PSBLAS_SO_VERSION 2)
+  elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0.0)
+    set(PSBLAS_SO_VERSION 1)
+  endif()
+endif()
+
+set(PSBLAS_MODDIR "${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}")
+set(MOD_DIR_FLAG "${CMAKE_Fortran_MODDIR_FLAG}")
+set(MPI_LIBS "")
+foreach( lib IN LISTS MPI_Fortran_LIBRARIES)
+  set(MPI_LIBS "${MPI_LIBS} \"${lib}\"")
+endforeach()
+string(STRIP "${MPI_LIBS}" MPI_LIBS)
+
+add_library(prec SHARED
+./psb_prec_const_mod.f90
+./psb_c_prec_mod.f90
+./psb_c_base_prec_mod.f90
+./psb_d_bjacprec.f90
+./psb_z_base_prec_mod.f90
+./psb_d_diagprec.f90
+./impl/psb_dprecbld.f90
+./impl/psb_cprecinit.f90
+./impl/psb_dprecinit.f90
+./impl/psb_zilu_fct.f90
+./impl/psb_silu_fct.f90
+./impl/psb_cprecset.f90
+./impl/psb_s_prec_type_impl.f90
+./impl/psb_dilu_fct.f90
+./impl/psb_cprecbld.f90
+./impl/psb_c_diagprec_impl.f90
+./impl/psb_s_bjacprec_impl.f90
+./impl/psb_z_prec_type_impl.f90
+./impl/psb_d_nullprec_impl.f90
+./impl/psb_c_nullprec_impl.f90
+./impl/psb_d_diagprec_impl.f90
+./impl/psb_zprecinit.f90
+./impl/psb_d_prec_type_impl.f90
+./impl/psb_c_prec_type_impl.f90
+./impl/psb_s_nullprec_impl.f90
+./impl/psb_sprecinit.f90
+./impl/psb_z_bjacprec_impl.f90
+./impl/psb_d_bjacprec_impl.f90
+./impl/psb_z_nullprec_impl.f90
+./impl/psb_dprecset.f90
+./impl/psb_c_bjacprec_impl.f90
+./impl/psb_zprecset.f90
+./impl/psb_sprecbld.f90
+./impl/psb_cilu_fct.f90
+./impl/psb_z_diagprec_impl.f90
+./impl/psb_sprecset.f90
+./impl/psb_zprecbld.f90
+./impl/psb_s_diagprec_impl.f90
+./psb_s_base_prec_mod.f90
+./psb_s_bjacprec.f90
+./psb_c_prec_type.f90
+./psb_s_nullprec.f90
+./psb_d_nullprec.f90
+./psb_prec_mod.f90
+./psb_d_prec_type.f90
+./psb_z_prec_type.f90
+./psb_z_prec_mod.f90
+./psb_z_nullprec.f90
+./psb_c_diagprec.f90
+./psb_z_bjacprec.f90
+./psb_s_prec_type.f90
+./psb_c_nullprec.f90
+./psb_prec_type.f90
+./psb_d_prec_mod.f90
+./psb_s_diagprec.f90
+./psb_c_bjacprec.f90
+./psb_s_prec_mod.f90
+./psb_z_diagprec.f90
+./psb_d_base_prec_mod.f90
+)
+add_library(prec_static STATIC
+./psb_prec_const_mod.f90
+./psb_c_prec_mod.f90
+./psb_c_base_prec_mod.f90
+./psb_d_bjacprec.f90
+./psb_z_base_prec_mod.f90
+./psb_d_diagprec.f90
+./impl/psb_dprecbld.f90
+./impl/psb_cprecinit.f90
+./impl/psb_dprecinit.f90
+./impl/psb_zilu_fct.f90
+./impl/psb_silu_fct.f90
+./impl/psb_cprecset.f90
+./impl/psb_s_prec_type_impl.f90
+./impl/psb_dilu_fct.f90
+./impl/psb_cprecbld.f90
+./impl/psb_c_diagprec_impl.f90
+./impl/psb_s_bjacprec_impl.f90
+./impl/psb_z_prec_type_impl.f90
+./impl/psb_d_nullprec_impl.f90
+./impl/psb_c_nullprec_impl.f90
+./impl/psb_d_diagprec_impl.f90
+./impl/psb_zprecinit.f90
+./impl/psb_d_prec_type_impl.f90
+./impl/psb_c_prec_type_impl.f90
+./impl/psb_s_nullprec_impl.f90
+./impl/psb_sprecinit.f90
+./impl/psb_z_bjacprec_impl.f90
+./impl/psb_d_bjacprec_impl.f90
+./impl/psb_z_nullprec_impl.f90
+./impl/psb_dprecset.f90
+./impl/psb_c_bjacprec_impl.f90
+./impl/psb_zprecset.f90
+./impl/psb_sprecbld.f90
+./impl/psb_cilu_fct.f90
+./impl/psb_z_diagprec_impl.f90
+./impl/psb_sprecset.f90
+./impl/psb_zprecbld.f90
+./impl/psb_s_diagprec_impl.f90
+./psb_s_base_prec_mod.f90
+./psb_s_bjacprec.f90
+./psb_c_prec_type.f90
+./psb_s_nullprec.f90
+./psb_d_nullprec.f90
+./psb_prec_mod.f90
+./psb_d_prec_type.f90
+./psb_z_prec_type.f90
+./psb_z_prec_mod.f90
+./psb_z_nullprec.f90
+./psb_c_diagprec.f90
+./psb_z_bjacprec.f90
+./psb_s_prec_type.f90
+./psb_c_nullprec.f90
+./psb_prec_type.f90
+./psb_d_prec_mod.f90
+./psb_s_diagprec.f90
+./psb_c_bjacprec.f90
+./psb_s_prec_mod.f90
+./psb_z_diagprec.f90
+./psb_d_base_prec_mod.f90
+)
+
+target_link_libraries(prec PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base)
+target_link_libraries(prec_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base)
+
+install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+  FILES_MATCHING PATTERN "*.mod")
+
+set_target_properties( prec_static
+  PROPERTIES
+  SOVERSION ${PSBLAS_SO_VERSION}
+)
+set_target_properties ( prec
+  PROPERTIES
+  SOVERSION ${PSBLAS_SO_VERSION}
+)
+set_target_properties(prec_static PROPERTIES OUTPUT_NAME prec)
+get_target_property(libprec_static prec_static OUTPUT_NAME)
+set(PSBLAS_LIBS "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${libprec_static}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+install(TARGETS prec EXPORT PSBLAS_Targets
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
+
+install(TARGETS prec_static EXPORT PSBLAS_Targets
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
new file mode 100644
index 000000000..b99d8c19b
--- /dev/null
+++ b/util/CMakeLists.txt
@@ -0,0 +1,182 @@
+if (NOT MPI_C_FOUND)
+  find_package(MPI REQUIRED)
+
+  set(CMAKE_C_COMPILE_FLAGS ${CMAKE_C_COMPILE_FLAGS} ${MPI_C_COMPILE_FLAGS})
+  set(CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS} ${MPI_C_LINK_FLAGS})
+  set(CMAKE_Fortran_COMPILE_FLAGS ${CMAKE_Fortran_COMPILE_FLAGS} ${MPI_Fortran_COMPILE_FLAGS})
+  set(CMAKE_Fortran_LINK_FLAGS ${CMAKE_Fortran_LINK_FLAGS} ${MPI_Fortran_LINK_FLAGS})
+  include_directories(BEFORE ${MPI_C_INCLUDE_PATH} ${MPI_Fortran_INCLUDE_PATH})
+endif()
+
+if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
+  set(gfortran_compiler true)
+endif()
+
+include(CheckIncludeFile)
+CHECK_INCLUDE_FILE("alloca.h" HAVE_ALLOCA)
+if(NOT HAVE_ALLOCA)
+  add_definitions(-DALLOCA_MISSING)
+  message(WARNING "Could not find <alloca.h>. Assuming functionality is provided elsewhere.")
+endif()
+
+set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
+if(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${MPI_C_INCLUDE_PATH})
+else()
+  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
+endif()
+set(old_cmake_required_flags "${CMAKE_REQUIRED_FLAGS}")
+if(CMAKE_REQUIRED_FLAGS)
+  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS};${MPI_C_COMPILE_FLAGS};${MPI_C_LINK_FLAGS})
+else()
+  set(CMAKE_REQUIRED_FLAGS ${MPI_C_COMPILE_FLAGS};${MPI_C_LINK_FLAGS})
+endif()
+set(old_cmake_required_libraries "${CMAKE_REQUIRED_LIBRARIES}")
+if(CMAKE_REQUIRED_LIBRARIES)
+  set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES};${MPI_C_LIBRARIES})
+else()
+  set(CMAKE_REQUIRED_LIBRARIES ${MPI_C_LIBRARIES})
+endif()
+
+set(MPI_HEADERS mpi.h)
+include(CheckIncludeFiles)
+CHECK_INCLUDE_FILES("mpi.h;mpi-ext.h" HAVE_MPI_EXT)
+if(HAVE_MPI_EXT)
+  add_definitions(-DHAVE_MPI_EXT_H)
+  set(MPI_HEADERS ${MPI_HEADERS};mpi-ext.h)
+endif()
+
+set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
+set(CMAKE_REQUIRED_FLAGS ${old_cmake_required_flags})
+set(CMAKE_REQUIRED_LIBRARIES ${old_cmake_required_libraries})
+
+#---------------------------------------------------
+# Windows Intel MPI compatibility, see GH issue #435
+#---------------------------------------------------
+set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
+if(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${MPI_C_INCLUDE_PATH})
+else()
+  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
+endif()
+CHECK_INCLUDE_FILES("mpi.h" HAVE_MPI_H)
+
+include(CheckSymbolExists)
+CHECK_SYMBOL_EXISTS(I_MPI_VERSION "mpi.h" HAVE_Intel_MPI)
+if(HAVE_Intel_MPI AND WIN32)
+  add_definitions(-DUSE_GCC)
+endif()
+set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
+
+set(PSBLAS_SO_VERSION 0)
+if(gfortran_compiler)
+  if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
+    set(PSBLAS_SO_VERSION 2)
+  elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0.0)
+    set(PSBLAS_SO_VERSION 1)
+  endif()
+endif()
+
+set(PSBLAS_MODDIR "${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}")
+set(MOD_DIR_FLAG "${CMAKE_Fortran_MODDIR_FLAG}")
+set(MPI_LIBS "")
+foreach( lib IN LISTS MPI_Fortran_LIBRARIES)
+  set(MPI_LIBS "${MPI_LIBS} \"${lib}\"")
+endforeach()
+string(STRIP "${MPI_LIBS}" MPI_LIBS)
+
+add_library(util SHARED
+metis_int.c
+psb_amd_order.c
+psb_blockpart_mod.f90
+psb_c_hbio_impl.f90
+psb_c_mat_dist_impl.f90
+psb_c_mat_dist_mod.f90
+psb_c_mmio_impl.f90
+psb_c_renum_impl.F90
+psb_d_hbio_impl.f90
+psb_d_mat_dist_impl.f90
+psb_d_mat_dist_mod.f90
+psb_d_mmio_impl.f90
+psb_d_renum_impl.F90
+psb_gps_mod.f90
+psb_hbio_mod.f90
+psb_i_mmio_impl.f90
+psb_mat_dist_mod.f90
+psb_metispart_mod.F90
+psb_mmio_mod.F90
+psb_renum_mod.f90
+psb_s_hbio_impl.f90
+psb_s_mat_dist_impl.f90
+psb_s_mat_dist_mod.f90
+psb_s_mmio_impl.f90
+psb_s_renum_impl.F90
+psb_util_mod.f90
+psb_z_hbio_impl.f90
+psb_z_mat_dist_impl.f90
+psb_z_mat_dist_mod.f90
+psb_z_mmio_impl.f90
+psb_z_renum_impl.F90
+)
+
+add_library(util_static STATIC
+metis_int.c
+psb_amd_order.c
+psb_blockpart_mod.f90
+psb_c_hbio_impl.f90
+psb_c_mat_dist_impl.f90
+psb_c_mat_dist_mod.f90
+psb_c_mmio_impl.f90
+psb_c_renum_impl.F90
+psb_d_hbio_impl.f90
+psb_d_mat_dist_impl.f90
+psb_d_mat_dist_mod.f90
+psb_d_mmio_impl.f90
+psb_d_renum_impl.F90
+psb_gps_mod.f90
+psb_hbio_mod.f90
+psb_i_mmio_impl.f90
+psb_mat_dist_mod.f90
+psb_metispart_mod.F90
+psb_mmio_mod.F90
+psb_renum_mod.f90
+psb_s_hbio_impl.f90
+psb_s_mat_dist_impl.f90
+psb_s_mat_dist_mod.f90
+psb_s_mmio_impl.f90
+psb_s_renum_impl.F90
+psb_util_mod.f90
+psb_z_hbio_impl.f90
+psb_z_mat_dist_impl.f90
+psb_z_mat_dist_mod.f90
+psb_z_mmio_impl.f90
+psb_z_renum_impl.F90
+)
+
+target_link_libraries(util PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base)
+target_link_libraries(util_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES} base)
+
+install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+  FILES_MATCHING PATTERN "*.mod")
+
+set_target_properties( util_static
+  PROPERTIES
+  SOVERSION ${PSBLAS_SO_VERSION}
+)
+set_target_properties ( util
+  PROPERTIES
+  SOVERSION ${PSBLAS_SO_VERSION}
+)
+set_target_properties(util_static PROPERTIES OUTPUT_NAME util)
+get_target_property(libutil_static util_static OUTPUT_NAME)
+set(PSBLAS_LIBS "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${libutil_static}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+install(TARGETS util EXPORT PSBLAS_Targets
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
+
+install(TARGETS util_static EXPORT PSBLAS_Targets
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)