diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45a4053166baacbf6111c5cf6f2d09c2158023d6..92bea56738bd7eb60d0d22b57764b029a840810b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,8 +32,14 @@ RelWithDebInfo MinSizeRel.")
 endif()
 
 # Set C and CXX compilers from the values read in the setting file. Might be overridden in command line.
-set(CMAKE_C_COMPILER ${CC} CACHE STRING "C compiler (or the Mpi wrapper over it).")
-set(CMAKE_CXX_COMPILER ${CXX} CACHE STRING "C++ compiler (or the Mpi wrapper over it).")
+
+if (NOT DEFINED CMAKE_C_COMPILER)
+    set(CMAKE_C_COMPILER ${MPI_CC})
+endif()
+
+if (NOT DEFINED CMAKE_CXX_COMPILER)
+    set(CMAKE_CXX_COMPILER ${MPI_CXX})
+endif()
 
 
 # ===================================================================================================================
@@ -41,6 +47,10 @@ set(CMAKE_CXX_COMPILER ${CXX} CACHE STRING "C++ compiler (or the Mpi wrapper ove
 # ===================================================================================================================
 project( "MoReFEM_CMAKE")
 
+MESSAGE("CC: " ${CC})
+MESSAGE("CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER})
+
+
 set_property(GLOBAL PROPERTY USE_FOLDERS OFF)
 
 
diff --git a/cmake/Paths.cmake b/cmake/Paths.cmake
index 964a4a5ac078db76cefbe3314fa5fc8c0f13b01d..b09674c91c24bc2173334b21f7b293f94535963c 100644
--- a/cmake/Paths.cmake
+++ b/cmake/Paths.cmake
@@ -1,9 +1,9 @@
 # Choose C and C++ compilers. You might also specifies here clang static analyzer (paths to ccc-analyzer and c++-analyzer respectively) to perform static analysis of the code.
-set(CC /Users/Shared/LibraryVersions/llvm-clang/Openmpi/bin/mpicc )
-set(CXX /Users/Shared/LibraryVersions/llvm-clang/Openmpi/bin/mpic++ )
+set(MPI_CC /Users/Shared/LibraryVersions/llvm-clang/Openmpi/bin/mpicc )
+set(MPI_CXX /Users/Shared/LibraryVersions/llvm-clang/Openmpi/bin/mpic++ )
 
 # Choose either STATIC or SHARED.
-set(LIBRARY_TYPE SHARED)
+set(LIBRARY_TYPE STATIC)
 
 # Whether a unique library is built for MoReFEM core libraries or on the contrary if it is splitted in modules.
 set(BUILD_MOREFEM_UNIQUE_LIBRARY False)