diff --git a/eo/CMakeLists.txt b/eo/CMakeLists.txt
index c10ac3c5e..78cab0a56 100644
--- a/eo/CMakeLists.txt
+++ b/eo/CMakeLists.txt
@@ -44,10 +44,12 @@ ENABLE_LANGUAGE(C)
 ### 2) Include required modules / configuration files
 #####################################################################################
 
-FIND_PACKAGE(OpenMP)
-IF(OPENMP_FOUND)
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+IF(WITH_OMP)
+    FIND_PACKAGE(OpenMP)
+    IF(OPENMP_FOUND)
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+    ENDIF()
 ENDIF()
 
 INCLUDE(CMakeBackwardCompatibilityCXX)
diff --git a/eo/eo-conf.cmake b/eo/eo-conf.cmake
index 2c115cfef..1f5ee8150 100644
--- a/eo/eo-conf.cmake
+++ b/eo/eo-conf.cmake
@@ -5,10 +5,13 @@ SET(PROJECT_VERSION_MINOR 3)
 SET(PROJECT_VERSION_PATCH 0)
 SET(PROJECT_VERSION_MISC "-edge")
 
+# If you plan to use OpenMP, put the following boolean to true :
+SET(WITH_OMP FALSE CACHE BOOL "Use OpenMP ?" FORCE)
+
 # If you plan to use MPI, precise here where are the static libraries from
 # openmpi and boost::mpi.
 
 SET(WITH_MPI FALSE CACHE BOOL "Use mpi ?" FORCE)
-SET(MPI_DIR "put root directory of openmpi here" CACHE PATH "OpenMPI directory" FORCE)
-SET(BOOST_DIR "put root directory of boost here" CACHE PATH "Boost directory" FORCE)
+SET(MPI_DIR "/mpi/directory" CACHE PATH "OpenMPI directory" FORCE)
+SET(BOOST_DIR "/boost/directory" CACHE PATH "Boost directory" FORCE)