* New tree configuration of the project:

.../
   ...           + -- EO
   |             |
   |             |
   +-- src ----- + -- EDO
   |             |
   |             |
   +-- test      + -- MO
   |             |
   |             |
   +-- tutorial  + -- MOEO
   |             |
   |             |
   +-- doc       + -- SMP
   |             |
   |             |
   ...           + -- EOMPI
                 |
                 |
                 + -- EOSERIAL

Question for current maintainers: ./README: new release?

Also:

* Moving out eompi & eoserial modules (issue #2).

* Correction of the errors when executing "make doc" command.

* Adding a solution for the conflicting headers problem (see the two CMake Cache
 Values: PROJECT_TAG & PROJECT_HRS_INSTALL_SUBPATH) (issue #1)

* Header inclusions:
        ** src: changing absolute paths into relative paths ('#include <...>' -> '#include "..."')
        ** test, tutorial: changing relative paths into absolute paths ('#include "..."' -> '#include <...>')

* Moving out some scripts from EDO -> to the root

* Add a new script for compilation and installation (see build_gcc_linux_install)

* Compilation with uBLAS library or EDO module: now ok

* Minor modifications on README & INSTALL files

* Comment eompi failed tests with no end

*** TODO: CPack (debian (DEB) & RedHat (RPM) packages) (issues #6 & #7) ***

CMakeLists.txt

@@ -50,21 +50,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Macro.cmake)
 
 ## Custom Targets file
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Target.cmake)
-
-######################################################################################
-### 4) Define and add module paths : EO, MO, MOEO
-######################################################################################
-
-## 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(   EOMPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eompi"      CACHE INTERNAL "ParadisEO-EOMPI    source directory" FORCE)
-set(EOSERIAL_SRC_DIR "${CMAKE_SOURCE_DIR}/eoserial"   CACHE INTERNAL "ParadisEO-EOSERIAL 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})
 
@@ -77,64 +62,56 @@ set(     SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP      bi
 set(   EOMPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EOMPI    binary directory" FORCE)
 set(EOSERIAL_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EOSERIAL binary directory" FORCE)
 
-set(EO_ONLY "false" CACHE BOOL "Only build EO and not the other modules")
-set(ENABLE_OPENMP "false" CACHE BOOL "Build EO with the OpenMP support (shared-memory parallel evaluators on multi-core)")
+######################################################################################
+### 4) Choose module(s) 
+######################################################################################
+
+set(EO_ONLY  "false" CACHE BOOL "Only build EO and not the other modules")
+set(MO       "false" CACHE BOOL "Build the MO module")
+set(EDO      "false" CACHE BOOL "Build the EDO module")
+set(MOEO     "false" CACHE BOOL "Build the MOEO module")
+set(SMP      "false" CACHE BOOL "Build the SMP module")
+set(EOMPI    "false" CACHE BOOL "Build the EOMPI module")
+set(EOSERIAL "false" CACHE BOOL "Build the EOSERIAL module")
+
+set(ENABLE_OPENMP  "false" CACHE BOOL "Build EO with the OpenMP support (shared-memory parallel evaluators on multi-core)")
 set(ENABLE_GNUPLOT "false" CACHE BOOL "Build EO with the GNUplot support (real-time convergence plotting)")
-#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(EOMPI "false" CACHE BOOL "Build the MPI module")
+set(EDO_USE_LIB    "Eigen3" CACHE STRING "Which linear algebra library to use to build EDO ('UBlas' or 'Eigen3', Eigen3 is recommended)")
 
-## EO Module
-set(EO_MODULE_NAME "Evolving Object")
-set(CMAKE_SOURCE_DIR ${EO_SRC_DIR})
-add_subdirectory(${EO_SRC_DIR})
+set(      EO_TEST_DIR "${CMAKE_SOURCE_DIR}/test/eo"         CACHE INTERNAL "ParadisEO-EO       test directory" FORCE)
+set(     EDO_TEST_DIR "${CMAKE_SOURCE_DIR}/test/edo"        CACHE INTERNAL "ParadisEO-EDO      test directory" FORCE)
+set(      MO_TEST_DIR "${CMAKE_SOURCE_DIR}/test/mo"         CACHE INTERNAL "ParadisEO-MO       test directory" FORCE)
+set(    MOEO_TEST_DIR "${CMAKE_SOURCE_DIR}/test/moeo"       CACHE INTERNAL "ParadisEO-MOEO     test directory" FORCE)
+set(     SMP_TEST_DIR "${CMAKE_SOURCE_DIR}/test/smp"        CACHE INTERNAL "ParadisEO-SMP      test directory" FORCE)
+set(   EOMPI_TEST_DIR "${CMAKE_SOURCE_DIR}/test/eompi"      CACHE INTERNAL "ParadisEO-EOMPI    test directory" FORCE)
+set(EOSERIAL_TEST_DIR "${CMAKE_SOURCE_DIR}/test/eoserial"   CACHE INTERNAL "ParadisEO-EOSERIAL test directory" FORCE)
 
-if(NOT EO_ONLY)
-    ## MO Module
-    set(MO_MODULE_NAME "Moving objects")
-    set(CMAKE_SOURCE_DIR ${MO_SRC_DIR})
-    add_subdirectory(${MO_SRC_DIR})
-
-    ## EDO Module
-    #if(EDO)
-        set(EDO_MODULE_NAME "Evolving Distribution Objects")
-        set(CMAKE_SOURCE_DIR ${EDO_SRC_DIR})
-        add_subdirectory(${EDO_SRC_DIR})
-    #endif()
-
-    ## MOEO Module
-    set(MOEO_MODULE_NAME "Multi-Objectives EO")
-    set(CMAKE_SOURCE_DIR ${MOEO_SRC_DIR})
-    add_subdirectory(${MOEO_SRC_DIR})
-
-    ## SMP Module
-    if(SMP)
-        set(SMP_MODULE_NAME "Symmetric Multi-Processing")
-        set(CMAKE_SOURCE_DIR ${SMP_SRC_DIR})
-        add_subdirectory(${SMP_SRC_DIR})
-    endif()
-
-    ## 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(${EOMPI_INCLUDE_PATH})
-        add_subdirectory(${EOMPI_SRC_DIR})
-    endif()
-
-    ## EOSERIAL Module
-    #if(EOSERIAL)
-        set(EOSERIAL_MODULE_NAME "Serialization Module")
-        set(CMAKE_SOURCE_DIR ${EOSERIAL_SRC_DIR})
-        add_subdirectory(${EOSERIAL_SRC_DIR})
-    #endif()
-endif()
+set(      EO_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/eo"         CACHE INTERNAL "ParadisEO-EO       tutorial directory" FORCE)
+set(     EDO_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/edo"        CACHE INTERNAL "ParadisEO-EDO      tutorial directory" FORCE)
+set(      MO_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/mo"         CACHE INTERNAL "ParadisEO-MO       tutorial directory" FORCE)
+set(    MOEO_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/moeo"       CACHE INTERNAL "ParadisEO-MOEO     tutorial directory" FORCE)
+set(     SMP_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/smp"        CACHE INTERNAL "ParadisEO-SMP      tutorial directory" FORCE)
+set(   EOMPI_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/eompi"      CACHE INTERNAL "ParadisEO-EOMPI    tutorial directory" FORCE)
+set(EOSERIAL_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/eoserial"   CACHE INTERNAL "ParadisEO-EOSERIAL tutorial directory" FORCE)
 
 ######################################################################################
-### 5) Packaging : only in release !
+### 5) Add sources
+######################################################################################
+
+add_subdirectory(src)
+add_subdirectory(doc)
+
+if(ENABLE_CMAKE_EXAMPLE)
+    add_subdirectory(tutorial)
+endif(ENABLE_CMAKE_EXAMPLE)
+
+if(ENABLE_CMAKE_TESTING)
+    add_subdirectory(test)
+endif(ENABLE_CMAKE_TESTING)
+
+
+######################################################################################
+### 6) Packaging : only in release !
 ######################################################################################
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")

README

@@ -8,6 +8,7 @@ The current release is paradisEO-2.0
 ==========================================================================================
                       INSTALLATION
 ==========================================================================================
+
 The basic installation procedure must be done in a separatly folder in order to keep
 your file tree clean.
 
@@ -22,8 +23,9 @@ Please refer to paradisEO website or INSTALL file for further information about
 installation types and options.
 
 ==========================================================================================
-                       DIRECTORY STRUCTURE
+                       DIRECTORY OLD STRUCTURE
 ==========================================================================================
+
 After unpacking the archive file, you should end up with the following
 structure:
 
@@ -36,32 +38,83 @@ structure:
    +-- cmake/				      CMake dir
    |
    |
-   +-- CMakeLists.txt			  For building process
+   +-- CMakeLists.txt			For building process
    |
    |
-   +-- CTestConfig.cmake		  For testing process
+   +-- CTestConfig.cmake	   For testing process
    |
    |
-   +-- INSTALL                    INSTALL file
+   +-- INSTALL                INSTALL file
    |
    |
    +-- LICENCE				      Licence contents
    |
    |
-   +-- paradiseo-eo 			  paradiseo-eo dir
+   +-- paradiseo-eo 			   paradiseo-eo dir
    |
    |
-   +-- paradiseo-mo               paradiseo-mo dir 
+   +-- paradiseo-mo           paradiseo-mo dir 
    |
    |
-   +-- paradiseo-moeo             paradiseo-moeo  dir
+   +-- paradiseo-moeo         paradiseo-moeo  dir
    |
    |
-   +-- problems                    classical problems evaluation functions
+   +-- problems               classical problems evaluation functions
    |
    |
    +-- README				       README file
 
+==========================================================================================
+                       DIRECTORY NEW STRUCTURE
+==========================================================================================
+
+After unpacking the archive file, you should end up with the following
+structure:
+
+.../                        
+   |
+   |
+   +-- AUTHORS             Author list 
+   |
+   |
+   +-- cmake/              CMake dir
+   |
+   |
+   +-- CMakeLists.txt      For building process
+   |
+   |
+   +-- CTestConfig.cmake   For testing process
+   |
+   |
+   +-- INSTALL             INSTALL file
+   |
+   |
+   +-- LICENCE             Licence contents
+   |
+   |
+   +-- src                 src dir
+   |
+   |
+   +-- test                tests dir 
+   |
+   |
+   +-- tutorial            tutorials dir
+   |
+   |
+   +-- doc                 documentation src
+   |
+   |
+   +-- deprecated          deprecated module
+   |
+   |
+   +-- websites            index of the paradiseo-website
+   |
+   |
+   +-- ForRelease          how to create a new release 
+   |
+   |
+   +-- README              README file
+
 ==========================================================================================
               NOTES
 ==========================================================================================
@@ -78,6 +131,7 @@ problems for the installation.
 ==========================================================================================
               CONTACT
 ==========================================================================================
+
 For further information about ParadisEO, help or to report any
 problem : paradiseo-help@lists.gforge.inria.fr
 

build_gcc_linux_install

@@ -0,0 +1,250 @@
+#!/usr/bin/env sh
+
+color() {
+	echo $(tput bold)$(tput setaf $1)$2$(tput sgr0)
+}
+
+##################################################################################
+# This script allows you to compile and install the sources, tests, tutorials,   #
+# and documentation of the framework depending on what you want to do!           #
+#                                                                                #
+# Launch this script on your terminal and let it be your guide !                 #
+##################################################################################
+
+mkdir -pv build
+cd build
+
+color 5 '\nDefine CMAKE cache values.\n'
+
+##################################
+# choose modules for compilation #
+# default modules: only EO       #
+##################################
+
+FLAG="-DEO_ONLY=false" #default
+
+color 1 'Do you want to compile the EO module only (false by default)?(y/n)' 
+read res
+
+if [ "$res" = "y" ]; then
+	FLAG="-DEO_ONLY=true"
+else
+	color 1 'Do you want to compile the EDO module (no by default)?(y/n)'
+	read res
+
+	if [ "$res" = "y" ]; then
+		FLAG=$FLAG' '" -DEDO=true"
+
+		##################################
+		# choose the library used by EDO #
+		# default library: Eigen3        #
+		##################################
+
+		color 1 'Compile EDO module with uBLAS (Eigen3 by default)?(y/n)' 
+		read res
+
+		if [ "$res" = "y" ]; then
+			FLAG=$FLAG' '" -DEDO_USE_LIB=uBLAS"
+		else
+			FLAG=$FLAG' '" -DEDO_USE_LIB=Eigen3"
+		fi #EDO_USE_LIB
+	else
+		FLAG=$FLAG' '" -DEDO=false" #default
+	fi #EDO 
+
+	color 1 'Do you want to compile the SMP module (no by default)?(y/n)'
+	read res
+
+	if [ "$res" = "y" ]; then
+		FLAG=$FLAG' '" -DSMP=true"
+	else
+		FLAG=$FLAG' '" -DSMP=false"
+	fi #SMP
+
+	color 1 'Do you want to compile the MOEO module (no by default)?(y/n)'
+	read res
+
+	if [ "$res" = "y" ]; then
+		FLAG=$FLAG' '" -DMOEO=true"
+	else
+		FLAG=$FLAG' '" -DMOEO=false"
+	fi #MOEO
+
+	color 1 'Do you want to compile the MO module (no by default)?(y/n)'
+	read res
+
+	if [ "$res" = "y" ]; then
+		FLAG=$FLAG' '" -DMO=true"
+	else
+		FLAG=$FLAG' '" -DMO=false"
+	fi #MO
+
+	color 1 'Do you want to compile the EOSERIAL module (no by default)?(y/n)'
+	read res
+
+	if [ "$res" = "y" ]; then
+		FLAG=$FLAG' '" -DEOSERIAL=true"
+	else
+		FLAG=$FLAG' '" -DEOSERIAL=false"
+	fi #EOSERIAL
+
+	color 1 'Do you want to compile the EOMPI module (no by default)?(y/n)'
+	read res
+
+	if [ "$res" = "y" ]; then
+		FLAG=$FLAG' '" -DEOMPI=true"
+	else
+		FLAG=$FLAG' '" -DEOMPI=false"
+	fi #EOMPI
+
+fi #EO_ONLY
+
+##################
+# Other settings #
+##################
+
+color 1 'Do you want to enable GNUPLOT (no by default)?(y/n)'
+read res
+
+if [ "$res" = "y" ]; then
+	FLAG=$FLAG' '" -DENABLE_GNUPLOT=true"
+else
+	FLAG=$FLAG' '" -DENABLE_GNUPLOT=false"
+fi #ENABLE_GNUPLOT
+
+color 1 'Do you want to enable OPENMP (no by default)?(y/n)'
+read res
+
+if [ "$res" = "y" ]; then
+	FLAG=$FLAG' '" -DENABLE_OPENMP=true"
+else
+	FLAG=$FLAG' '" -DENABLE_OPENMP=false"
+fi #ENABLE_OPENMP
+
+color 5 "\nset $FLAG\n"
+
+cmake $FLAG ..
+
+###############
+# compile doc #
+# default: no #
+###############
+
+color 1 '\nDo you want to compile the documentation (be patient it can be a bit long)?(y/n)'
+read res
+
+if [ "$res" = "y" ]; then
+
+	make doc
+fi
+
+##############################################
+# install sources on your laptop             #
+# default path: /usr/local/include/paradiseo #
+##############################################
+
+color 1 '\nDo you want to install the sources on your laptop?(y/n)
+If "no" you will not be able to compile tests or tutorials 
+which require the project library installation on your laptop.' 
+read res
+
+if [ "$res" = "y" ]; then
+
+	color 5 '\nOk. For your information we let you the possibility
+to change the install path on your laptop but also to
+personalize the project name in order to avoid some 
+name conflicts with headers.
+Go see the script line 166-170 to see what it looks like.'
+
+	color 1 'Continue the installation?(y/n)'
+	read res
+
+	if [ "$res" = "n" ]; then
+		exit
+	fi
+
+	#cmake -DCMAKE_INSTALL_PREFIX=new_path .. #default
+	#cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. 
+
+	#cmake -DPROJECT_HDRS_INSTALL_SUBPATH=/include .. #default
+	#cmake -DPROJECT_TAG=paradiseo .. #default
+
+	sudo make install
+	
+	#################
+	# compile tests #
+	# default: no   #
+	#################
+
+	color 1 '\nDo you want to compile tests?(y/n)'
+	read test_compile
+
+	if [ "$test_compile" = "y" ]; then
+
+		FLAG=$FLAG' '" -DENABLE_CMAKE_TESTING=true"
+
+	else
+
+		FLAG=$FLAG' '" -DENABLE_CMAKE_TESTING=false" 
+
+	fi
+
+    #####################
+	# compile tutorials #
+	# default: no       #
+	#####################
+
+	color 1 'Do you want to compile tutorials?(y/n)'
+	read tutorial_compile
+
+	if [ "$tutorial_compile" = "y" ]; then
+
+		FLAG=$FLAG' '" -DENABLE_CMAKE_EXAMPLE=true"
+
+	else
+
+		FLAG=$FLAG' '" -DENABLE_CMAKE_EXAMPLE=false"
+
+	fi
+
+	color 5 "\nset $FLAG\n"
+	cmake $FLAG .. 
+
+	if [ "$test_compile" = "y" ] || [ "$tutorial_compile" = "y" ]; then
+
+		color 1 'And do you want to install tests or tutorials?(y/n)'
+		read install
+
+
+		if [ "$install" = "y" ]; then
+
+			sudo make install
+
+		else
+
+			make
+
+		fi
+
+	fi
+
+    #################
+	# execute tests #
+    #################
+
+	if [ "$test_compile" = "y" ] && [ "$install" = "y" ]; then
+
+			color 1 'Do you want to execute the tests?(y/n)'
+			read test_execute
+
+			if [ "$test_execute" = "y" ]; then
+
+				ctest ..
+			fi
+	fi
+
+else
+
+	make
+
+fi 

cmake/Config.cmake

@@ -68,7 +68,7 @@ endif(PROFILING)
 ######################################################################################
 ### 3) Testing part
 ######################################################################################
-
+ 
 if(ENABLE_CMAKE_TESTING)
     enable_testing()
     include(CTest REQUIRED)
@@ -85,8 +85,13 @@ set(ENABLE_CMAKE_EXAMPLE "true" CACHE BOOL "ParadisEO examples")
 ######################################################################################
 
 if(UNIX)
-    set(INSTALL_SUB_DIR /paradiseo)
+    set(PROJECT_TAG "paradiseo" CACHE STRING "Project name as installation prefix")
+
+    # Define the path where the project headers have to be installed and where they can be found (linker) 
+    set(PROJECT_HDRS_INSTALL_SUBPATH /include CACHE PATH "Install subpath towards the project header")
+    set(PROJECT_HDRS_INSTALL_SUBPATH ${CMAKE_INSTALL_PREFIX}${PROJECT_HDRS_INSTALL_SUBPATH})
 endif()
 
-
-
+if (ENABLE_CMAKE_TESTING OR ENABLE_CMAKE_EXAMPLE)
+    message("Warning: Please ensure that you have executed the 'sudo make install' command before asking the compilation of the tests or examples.")
+endif ()

cmake/Macro.cmake

@@ -30,7 +30,7 @@ macro(add_lesson module target files)
 	    elseif(${module} MATCHES smp)
 	        target_link_libraries(${i} smp eo eoutils)
 	    endif() 
-	    install(TARGETS ${i} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/${module}/tutorial/${target} COMPONENT examples)   
+	    install(TARGETS ${i} RUNTIME DESTINATION share/${PROJECT_TAG}/${module}/tutorial/${target} COMPONENT examples)   
 	endforeach(i)
 	
 	# Custom target

cmake/Target.cmake

@@ -11,27 +11,27 @@ endif(UNIX)
 ######################################################################################
 
 if(DOXYGEN_FOUND AND DOXYGEN_EXECUTABLE)
+    add_custom_target(doc
+        COMMAND make doc-eo)
     if(NOT EO_ONLY)
+        if(EDO)
+            add_dependencies(doc
+                COMMAND make doc-edo)
+        endif(EDO)
+        if(MO)
+            add_dependencies(doc
+                COMMAND make doc-mo)
+        endif(MO)
+        if(MOEO)
+            add_dependencies(doc
+                COMMAND make doc-moeo)
+        endif(MOEO)
         if(SMP)
-            add_custom_target(doc
-                COMMAND make doc-eo
-                COMMAND make doc-edo
-                COMMAND make doc-mo
-                COMMAND make doc-moeo
-                COMMAND make doc-smp
-            )
-        else()
-            add_custom_target(doc
-                COMMAND make doc-eo
-                COMMAND make doc-edo
-                COMMAND make doc-mo
-                COMMAND make doc-moeo
-            )
+            add_dependencies(doc
+                COMMAND make doc-smp)
         endif(SMP)
-    else()
-        add_custom_target(doc
-            COMMAND make doc-eo
-        )
+        # no independent documentations for eompi, eoserial modules for the moment 
+        # maybe go check the eo module documentation 
     endif(NOT EO_ONLY)
 endif(DOXYGEN_FOUND AND DOXYGEN_EXECUTABLE)
 

cmake/module/FindParadiseo.cmake

@@ -35,7 +35,7 @@
 #   target_link_libraries(examplep ${PARADISEO_LIBRARIES})
 
 if(UNIX)
-    set(INSTALL_SUB_DIR /paradiseo)
+    set(PROJECT_TAG /paradiseo)
 endif()
 
 # enabled components
@@ -63,19 +63,19 @@ set(PARADISEO_SRC_PATHS
 )
 
 find_path(EO_INCLUDE_DIR eo
-          PATH_SUFFIXES include${INSTALL_SUB_DIR}/eo eo/src
+          PATH_SUFFIXES include/${PROJECT_TAG}/eo eo/src
           PATHS ${PARADISEO_SRC_PATHS})
 
 find_path(MO_INCLUDE_DIR mo
-          PATH_SUFFIXES include${INSTALL_SUB_DIR}/mo mo/src
+          PATH_SUFFIXES include/${PROJECT_TAG}/mo mo/src
           PATHS ${PARADISEO_SRC_PATHS})
 
 find_path(MOEO_INCLUDE_DIR moeo
-          PATH_SUFFIXES include${INSTALL_SUB_DIR}/moeo moeo/src
+          PATH_SUFFIXES include/${PROJECT_TAG}/moeo moeo/src
           PATHS ${PARADISEO_SRC_PATHS})
 
 find_path(EOSERIAL_INCLUDE_DIR eoserial
-          PATH_SUFFIXES include${INSTALL_SUB_DIR}/eoserial eoserial/src
+          PATH_SUFFIXES include/${PROJECT_TAG}/eoserial eoserial/src
           PATHS ${PARADISEO_SRC_PATHS})
 
 # Specific for SMP and PEO
@@ -83,22 +83,22 @@ foreach(COMP ${PARADISEO_LIBRARIES_TO_FIND})
     if(${COMP} STREQUAL "smp")
         set(SMP_FOUND true)
         find_path(SMP_INCLUDE_DIR smp
-              PATH_SUFFIXES include${INSTALL_SUB_DIR}/smp smp/src
+              PATH_SUFFIXES include/${PROJECT_TAG}/smp smp/src
               PATHS ${PARADISEO_SRC_PATHS})
     elseif(${COMP} STREQUAL "peo")
         set(PEO_FOUND true)
         find_path(PEO_INCLUDE_DIR peo
-          PATH_SUFFIXES include${INSTALL_SUB_DIR}/peo peo/src
+          PATH_SUFFIXES include/${PROJECT_TAG}/peo peo/src
           PATHS ${PARADISEO_SRC_PATHS})
     elseif(${COMP} STREQUAL "edo")
         set(EDO_FOUND true)
         find_path(EDO_INCLUDE_DIR edo
-              PATH_SUFFIXES include${INSTALL_SUB_DIR}/edo edo/src
+              PATH_SUFFIXES include/${PROJECT_TAG}/edo edo/src
               PATHS ${PARADISEO_SRC_PATHS})
     elseif(${COMP} STREQUAL "eompi")
         set(EOMPI_FOUND true)
         find_path(EOMPI_INCLUDE_DIR eompi
-          PATH_SUFFIXES include${INSTALL_SUB_DIR}/eompi eompi/src
+          PATH_SUFFIXES include/${PROJECT_TAG}/eompi eompi/src
           PATHS ${PARADISEO_SRC_PATHS})
     endif()
 endforeach()