From 7f88653b1eeaec0e7639838dae221d2729eb5132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= <adele.harrissart@gmail.com>
Date: Tue, 17 Jun 2014 14:47:20 +0200
Subject: [PATCH] Redefine paths to the module sources and the module library
 and rename "mpi" module into "eompi".

---
 CMakeLists.txt | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f279e5a3e..c658a286c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,24 +56,25 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Target.cmake)
 ######################################################################################
 
 ## Paths to sources of modules
-set(  EO_SRC_DIR "${CMAKE_SOURCE_DIR}/eo"   CACHE INTERNAL "ParadisEO-EO   source directory" FORCE)
-set( EDO_SRC_DIR "${CMAKE_SOURCE_DIR}/edo"  CACHE INTERNAL "ParadisEO-EDO  source directory" FORCE)
-set(  MO_SRC_DIR "${CMAKE_SOURCE_DIR}/mo"   CACHE INTERNAL "ParadisEO-MO   source directory" FORCE)
-set(MOEO_SRC_DIR "${CMAKE_SOURCE_DIR}/moeo" CACHE INTERNAL "ParadisEO-MOEO source directory" FORCE)
-set( SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp"  CACHE INTERNAL "ParadisEO-SMP  source directory" FORCE)
-set( MPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eo/src/mpi"  CACHE INTERNAL "ParadisEO-MPI source directory" FORCE)
+set(   EO_SRC_DIR "${CMAKE_SOURCE_DIR}/eo"     CACHE INTERNAL "ParadisEO-EO    source directory" FORCE)
+set(  EDO_SRC_DIR "${CMAKE_SOURCE_DIR}/edo"    CACHE INTERNAL "ParadisEO-EDO   source directory" FORCE)
+set(   MO_SRC_DIR "${CMAKE_SOURCE_DIR}/mo"     CACHE INTERNAL "ParadisEO-MO    source directory" FORCE)
+set( MOEO_SRC_DIR "${CMAKE_SOURCE_DIR}/moeo"   CACHE INTERNAL "ParadisEO-MOEO  source directory" FORCE)
+set(  SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp"    CACHE INTERNAL "ParadisEO-SMP   source directory" FORCE)
+set(EOMPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eompi"  CACHE INTERNAL "ParadisEO-EOMPI source directory" FORCE)
+
 
 set(PROBLEMS_SRC_DIR "${CMAKE_SOURCE_DIR}/problems" CACHE INTERNAL "Problems dependant source directory" FORCE)
 
 set(CMAKE_BASE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 # All libraries are built in <build_dir>/lib/
-set(  EO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EO   binary directory" FORCE)
-set( EDO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EDO  binary directory" FORCE)
-set(  MO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MO   binary directory" FORCE)
-set(MOEO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MOEO binary directory" FORCE)
-set( SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP  binary directory" FORCE)
-set( MPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MPI  binary directory" FORCE)
+set(   EO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EO    binary directory" FORCE)
+set(  EDO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EDO   binary directory" FORCE)
+set(   MO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MO    binary directory" FORCE)
+set( MOEO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MOEO  binary directory" FORCE)
+set(  SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP   binary directory" FORCE)
+set(EOMPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EOMPI binary directory" FORCE)
 
 
 set(EO_ONLY "false" CACHE BOOL "Only build EO and not the other modules")
@@ -82,7 +83,7 @@ set(ENABLE_GNUPLOT "false" CACHE BOOL "Build EO with the GNUplot support (real-t
 set(EDO "false" CACHE BOOL "Build the EDO module")
 set(EDO_USE_LIB "Eigen3" CACHE STRING "Which linear algebra library to use to build EDO ('UBlas' or 'Eigen3', Eigen3 is recommended)")
 set(SMP "false" CACHE BOOL "Build the SMP module")
-set(MPI "false" CACHE BOOL "Build the MPI module")
+set(EOMPI "false" CACHE BOOL "Build the MPI module")
 
 ## EO Module
 set(EO_MODULE_NAME "Evolving Object")
@@ -114,14 +115,14 @@ if(NOT EO_ONLY)
         add_subdirectory(${SMP_SRC_DIR})
     endif()
 
-    ## MPI Module
-    if(MPI)
+    ## EOMPI Module
+    if(EOMPI)
         find_package(MPI REQUIRED)
         add_definitions(-DWITH_MPI)
         set(CMAKE_CXX_COMPILE_FLAGS ${CMAKE_CXX_COMPILE_FLAGS} ${MPI_COMPILE_FLAGS})
         set(CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS} ${MPI_LINK_FLAGS})
-        include_directories(${MPI_INCLUDE_PATH})
-        add_subdirectory(${MPI_SRC_DIR})
+        include_directories(${EOMPI_INCLUDE_PATH})
+        add_subdirectory(${EOMPI_SRC_DIR})
     endif()
 endif()