From 83ab8f0068455561f95ea13e56ed5da0959f7724 Mon Sep 17 00:00:00 2001
From: Johann Dreo <johann.dreo@thalesgroup.com>
Date: Sun, 7 Oct 2012 21:19:42 +0200
Subject: [PATCH] add edo to cmake modules

---
 cmake/Target.cmake               | 14 ++++++++------
 cmake/module/FindParadiseo.cmake | 20 +++++++++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/cmake/Target.cmake b/cmake/Target.cmake
index 396d4ac13..a2cd0e584 100644
--- a/cmake/Target.cmake
+++ b/cmake/Target.cmake
@@ -1,9 +1,9 @@
 ######################################################################################
-### Mrproper will delete all files and folders in build directory
+### cleanall will delete all files and folders in build directory
 ######################################################################################
 
 if(UNIX)
-    add_custom_target(mrproper COMMAND cd ${CMAKE_BINARY_DIR} && rm -rf *)
+    add_custom_target(cleanall COMMAND cd ${CMAKE_BINARY_DIR} && rm -rf *)
 endif(UNIX)
 
 ######################################################################################
@@ -12,16 +12,18 @@ endif(UNIX)
 
 if(DOXYGEN_FOUND AND DOXYGEN_EXECUTABLE)
     if(SMP)
-        add_custom_target(doc 
+        add_custom_target(doc
             COMMAND make doc-eo
-            COMMAND make doc-mo 
+            COMMAND make doc-edo
+            COMMAND make doc-mo
             COMMAND make doc-moeo
             COMMAND make doc-smp
         )
     else()
-        add_custom_target(doc 
+        add_custom_target(doc
             COMMAND make doc-eo
-            COMMAND make doc-mo 
+            COMMAND make doc-edo
+            COMMAND make doc-mo
             COMMAND make doc-moeo
         )
     endif()
diff --git a/cmake/module/FindParadiseo.cmake b/cmake/module/FindParadiseo.cmake
index 1dd1633f7..0f476e092 100644
--- a/cmake/module/FindParadiseo.cmake
+++ b/cmake/module/FindParadiseo.cmake
@@ -1,9 +1,8 @@
-# File: FindParadiseo.cmake
-# Version: 0.0.1
 #
 # The following variables are filled out:
 # - PARADISEO_INCLUDE_DIR : EO, MO and MOEO source dir
 # - EO_INCLUDE_DIR :        EO source dir
+# - EDO_INCLUDE_DIR :        EO source dir
 # - MO_INCLUDE_DIR :        MO source dir
 # - MOEO_INCLUDE_DIR :      MOEO source dir. WARNING : You have ton include MO before !
 # - PARADISEO_LIBRARIES :   the list of all required modules
@@ -13,6 +12,7 @@
 #
 # Here are the components:
 # - eo
+# - edo
 # - PyEO
 # - es
 # - ga
@@ -38,7 +38,7 @@ endif()
 
 # enabled components
 if ("${Paradiseo_FIND_COMPONENTS}" STREQUAL "")
-    set(PARADISEO_LIBRARIES_TO_FIND eo eoutils cma es flowshop ga moeo)
+    set(PARADISEO_LIBRARIES_TO_FIND eo eoutils edoutils cma es flowshop ga moeo)
 else()
     set(PARADISEO_LIBRARIES_TO_FIND ${Paradiseo_FIND_COMPONENTS})
 endif()
@@ -63,7 +63,11 @@ set(PARADISEO_SRC_PATHS
 find_path(EO_INCLUDE_DIR eo
           PATH_SUFFIXES include${INSTALL_SUB_DIR}/eo eo/src
           PATHS ${PARADISEO_SRC_PATHS})
-          
+
+find_path(EDO_INCLUDE_DIR edo
+          PATH_SUFFIXES include${INSTALL_SUB_DIR}/edo edo/src
+          PATHS ${PARADISEO_SRC_PATHS})
+
 find_path(MO_INCLUDE_DIR mo
           PATH_SUFFIXES include${INSTALL_SUB_DIR}/mo mo/src
           PATHS ${PARADISEO_SRC_PATHS})
@@ -71,7 +75,7 @@ find_path(MO_INCLUDE_DIR mo
 find_path(MOEO_INCLUDE_DIR moeo
           PATH_SUFFIXES include${INSTALL_SUB_DIR}/moeo moeo/src
           PATHS ${PARADISEO_SRC_PATHS})
-          
+
 # Specific for SMP and PEO
 foreach(COMP ${PARADISEO_LIBRARIES_TO_FIND})
     if(${COMP} STREQUAL "smp")
@@ -87,7 +91,7 @@ foreach(COMP ${PARADISEO_LIBRARIES_TO_FIND})
     endif()
 endforeach()
 
-set(PARADISEO_INCLUDE_DIR ${EO_INCLUDE_DIR} ${MO_INCLUDE_DIR} ${MOEO_INCLUDE_DIR})           
+set(PARADISEO_INCLUDE_DIR ${EO_INCLUDE_DIR} ${EDO_INCLUDE_DIR} ${MO_INCLUDE_DIR} ${MOEO_INCLUDE_DIR})
 
 if(SMP_FOUND)
     set(PARADISEO_INCLUDE_DIR ${PARADISEO_INCLUDE_DIR} ${SMP_INCLUDE_DIR})
@@ -116,6 +120,7 @@ set(FIND_PARADISEO_LIB_PATHS
 #Suffixes
 set(PARADISEO_LIB_PATHS_SUFFIXES
         eo/lib 
+        edo/lib 
         mo/lib 
         moeo/lib 
         moeo/tutorial/examples/flowshop/lib #For flowshop library
@@ -125,7 +130,7 @@ set(PARADISEO_LIB_PATHS_SUFFIXES
         lib32 
         lib64
         )
-        
+
 foreach(FIND_PARADISEO_COMPONENT ${PARADISEO_LIBRARIES_TO_FIND})
     string(TOUPPER ${FIND_PARADISEO_COMPONENT} FIND_PARADISEO_COMPONENT_UPPER)
     # release library
@@ -149,6 +154,7 @@ endforeach()
 if(PARADISEO_FOUND)
     message(STATUS "Found ParadisEO includes :")
     message(${EO_INCLUDE_DIR})
+    message(${EDO_INCLUDE_DIR})
     message(${MO_INCLUDE_DIR})
     message(${MOEO_INCLUDE_DIR})
     if(SMP_FOUND)