nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add edo to cmake modules

Browse source
This commit is contained in:
Johann Dreo 2012-10-07 21:19:42 +02:00
commit 83ab8f0068
2 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmake/Target.cmake
View file

@ -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) 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) endif(UNIX)
###################################################################################### ######################################################################################
@ -12,16 +12,18 @@ endif(UNIX)
if(DOXYGEN_FOUND AND DOXYGEN_EXECUTABLE) if(DOXYGEN_FOUND AND DOXYGEN_EXECUTABLE)
if(SMP) if(SMP)
add_custom_target(doc add_custom_target(doc
COMMAND make doc-eo COMMAND make doc-eo
COMMAND make doc-mo COMMAND make doc-edo
COMMAND make doc-mo
COMMAND make doc-moeo COMMAND make doc-moeo
COMMAND make doc-smp COMMAND make doc-smp
) )
else() else()
add_custom_target(doc add_custom_target(doc
COMMAND make doc-eo COMMAND make doc-eo
COMMAND make doc-mo COMMAND make doc-edo
COMMAND make doc-mo
COMMAND make doc-moeo COMMAND make doc-moeo
) )
endif() endif()

20
cmake/module/FindParadiseo.cmake
View file

@ -1,9 +1,8 @@
# File: FindParadiseo.cmake
# Version: 0.0.1
# #
# The following variables are filled out: # The following variables are filled out:
# - PARADISEO_INCLUDE_DIR : EO, MO and MOEO source dir # - PARADISEO_INCLUDE_DIR : EO, MO and MOEO source dir
# - EO_INCLUDE_DIR : EO source dir # - EO_INCLUDE_DIR : EO source dir
# - EDO_INCLUDE_DIR : EO source dir
# - MO_INCLUDE_DIR : MO source dir # - MO_INCLUDE_DIR : MO source dir
# - MOEO_INCLUDE_DIR : MOEO source dir. WARNING : You have ton include MO before ! # - MOEO_INCLUDE_DIR : MOEO source dir. WARNING : You have ton include MO before !
# - PARADISEO_LIBRARIES : the list of all required modules # - PARADISEO_LIBRARIES : the list of all required modules
@ -13,6 +12,7 @@
# #
# Here are the components: # Here are the components:
# - eo # - eo
# - edo
# - PyEO # - PyEO
# - es # - es
# - ga # - ga
@ -38,7 +38,7 @@ endif()
# enabled components # enabled components
if ("${Paradiseo_FIND_COMPONENTS}" STREQUAL "") 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() else()
set(PARADISEO_LIBRARIES_TO_FIND ${Paradiseo_FIND_COMPONENTS}) set(PARADISEO_LIBRARIES_TO_FIND ${Paradiseo_FIND_COMPONENTS})
endif() endif()
@ -63,7 +63,11 @@ set(PARADISEO_SRC_PATHS
find_path(EO_INCLUDE_DIR eo find_path(EO_INCLUDE_DIR eo
PATH_SUFFIXES include${INSTALL_SUB_DIR}/eo eo/src PATH_SUFFIXES include${INSTALL_SUB_DIR}/eo eo/src
PATHS ${PARADISEO_SRC_PATHS}) 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 find_path(MO_INCLUDE_DIR mo
PATH_SUFFIXES include${INSTALL_SUB_DIR}/mo mo/src PATH_SUFFIXES include${INSTALL_SUB_DIR}/mo mo/src
PATHS ${PARADISEO_SRC_PATHS}) PATHS ${PARADISEO_SRC_PATHS})
@ -71,7 +75,7 @@ find_path(MO_INCLUDE_DIR mo
find_path(MOEO_INCLUDE_DIR moeo find_path(MOEO_INCLUDE_DIR moeo
PATH_SUFFIXES include${INSTALL_SUB_DIR}/moeo moeo/src PATH_SUFFIXES include${INSTALL_SUB_DIR}/moeo moeo/src
PATHS ${PARADISEO_SRC_PATHS}) PATHS ${PARADISEO_SRC_PATHS})
# Specific for SMP and PEO # Specific for SMP and PEO
foreach(COMP ${PARADISEO_LIBRARIES_TO_FIND}) foreach(COMP ${PARADISEO_LIBRARIES_TO_FIND})
if(${COMP} STREQUAL "smp") if(${COMP} STREQUAL "smp")
@ -87,7 +91,7 @@ foreach(COMP ${PARADISEO_LIBRARIES_TO_FIND})
endif() endif()
endforeach() 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) if(SMP_FOUND)
set(PARADISEO_INCLUDE_DIR ${PARADISEO_INCLUDE_DIR} ${SMP_INCLUDE_DIR}) set(PARADISEO_INCLUDE_DIR ${PARADISEO_INCLUDE_DIR} ${SMP_INCLUDE_DIR})
@ -116,6 +120,7 @@ set(FIND_PARADISEO_LIB_PATHS
#Suffixes #Suffixes
set(PARADISEO_LIB_PATHS_SUFFIXES set(PARADISEO_LIB_PATHS_SUFFIXES
eo/lib eo/lib
edo/lib
mo/lib mo/lib
moeo/lib moeo/lib
moeo/tutorial/examples/flowshop/lib #For flowshop library moeo/tutorial/examples/flowshop/lib #For flowshop library
@ -125,7 +130,7 @@ set(PARADISEO_LIB_PATHS_SUFFIXES
lib32 lib32
lib64 lib64
) )
foreach(FIND_PARADISEO_COMPONENT ${PARADISEO_LIBRARIES_TO_FIND}) foreach(FIND_PARADISEO_COMPONENT ${PARADISEO_LIBRARIES_TO_FIND})
string(TOUPPER ${FIND_PARADISEO_COMPONENT} FIND_PARADISEO_COMPONENT_UPPER) string(TOUPPER ${FIND_PARADISEO_COMPONENT} FIND_PARADISEO_COMPONENT_UPPER)
# release library # release library
@ -149,6 +154,7 @@ endforeach()
if(PARADISEO_FOUND) if(PARADISEO_FOUND)
message(STATUS "Found ParadisEO includes :") message(STATUS "Found ParadisEO includes :")
message(${EO_INCLUDE_DIR}) message(${EO_INCLUDE_DIR})
message(${EDO_INCLUDE_DIR})
message(${MO_INCLUDE_DIR}) message(${MO_INCLUDE_DIR})
message(${MOEO_INCLUDE_DIR}) message(${MOEO_INCLUDE_DIR})
if(SMP_FOUND) if(SMP_FOUND)