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

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/paradiseo/paradiseo

Browse source
This commit is contained in:
verel 2012-11-12 15:27:18 +01:00
commit 01e25fb7b4
28 changed files with 67 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -24,7 +24,7 @@ endif()
## Versioning ## Versioning
set(VERSION_MAJOR 2) set(VERSION_MAJOR 2)
set(VERSION_MINOR 0) set(VERSION_MINOR 0)
set(VERSION_PATCH 0) set(VERSION_PATCH 1)
###################################################################################### ######################################################################################
### 2) Check dependencies ### 2) Check dependencies

2
cmake/Config.cmake
View file

@ -91,3 +91,5 @@ if(UNIX)
set(INSTALL_SUB_DIR /paradiseo) set(INSTALL_SUB_DIR /paradiseo)
endif() endif()

2
cmake/Macro.cmake
View file

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

15
eo/CMakeLists.txt
View file

@ -111,8 +111,17 @@ ENDIF (WIN32)
#ADD_SUBDIRECTORY(app) #ADD_SUBDIRECTORY(app)
ADD_SUBDIRECTORY(doc) ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(test)
ADD_SUBDIRECTORY(tutorial) if(ENABLE_CMAKE_TESTING)
add_subdirectory(test)
endif(ENABLE_CMAKE_TESTING)
if(ENABLE_CMAKE_EXAMPLE)
if(${CMAKE_VERBOSE_MAKEFILE})
message("EO Examples :")
endif(${CMAKE_VERBOSE_MAKEFILE})
add_subdirectory(tutorial)
endif(ENABLE_CMAKE_EXAMPLE)
###################################################################################### ######################################################################################
@ -125,7 +134,7 @@ SET(PCPREFIX "/usr")
SET(PCFLAGS "-leoutils -leo -les -lga -lcma -lgcov") SET(PCFLAGS "-leoutils -leo -les -lga -lcma -lgcov")
SET(PCINCLUDEDIR "eo") SET(PCINCLUDEDIR "eo")
CONFIGURE_FILE(pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/eo.pc) CONFIGURE_FILE(pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/eo.pc)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/eo.pc DESTINATION local/${LIB}/pkgconfig COMPONENT headers) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/eo.pc DESTINATION ${LIB}/pkgconfig COMPONENT headers)
###################################################################################### ######################################################################################

2
eo/doc/CMakeLists.txt
View file

@ -39,7 +39,7 @@ IF (DOXYGEN_FOUND)
INSTALL( INSTALL(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DESTINATION local/share${INSTALL_SUB_DIR}/eo COMPONENT doc DESTINATION share${INSTALL_SUB_DIR}/eo COMPONENT doc
PATTERN "CMakeFiles" EXCLUDE PATTERN "CMakeFiles" EXCLUDE
PATTERN "cmake_install.cmake" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE
PATTERN "Makefile" EXCLUDE PATTERN "Makefile" EXCLUDE

6
eo/src/CMakeLists.txt
View file

@ -21,13 +21,13 @@ SET(EO_SOURCES
) )
ADD_LIBRARY(eo STATIC ${EO_SOURCES}) ADD_LIBRARY(eo STATIC ${EO_SOURCES})
INSTALL(TARGETS eo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) INSTALL(TARGETS eo ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
FILE(GLOB HDRS *.h eo) FILE(GLOB HDRS *.h eo)
INSTALL(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/eo COMPONENT headers) INSTALL(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eo COMPONENT headers)
INSTALL(DIRECTORY do es ga gp other utils INSTALL(DIRECTORY do es ga gp other utils
DESTINATION local/include${INSTALL_SUB_DIR}/eo DESTINATION include${INSTALL_SUB_DIR}/eo
COMPONENT headers COMPONENT headers
FILES_MATCHING PATTERN "*.h" PATTERN "checkpointing" PATTERN external_eo FILES_MATCHING PATTERN "*.h" PATTERN "checkpointing" PATTERN external_eo
) )

4
eo/src/es/CMakeLists.txt
View file

@ -38,10 +38,10 @@ SET(CMA_SOURCES
) )
ADD_LIBRARY(es STATIC ${ES_SOURCES}) ADD_LIBRARY(es STATIC ${ES_SOURCES})
INSTALL(TARGETS es ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) INSTALL(TARGETS es ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
ADD_LIBRARY(cma STATIC ${CMA_SOURCES}) ADD_LIBRARY(cma STATIC ${CMA_SOURCES})
INSTALL(TARGETS cma ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) INSTALL(TARGETS cma ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
###################################################################################### ######################################################################################
### 3) Optionnal ### 3) Optionnal

2
eo/src/ga/CMakeLists.txt
View file

@ -23,7 +23,7 @@ SET(GA_SOURCES
) )
ADD_LIBRARY(ga STATIC ${GA_SOURCES}) ADD_LIBRARY(ga STATIC ${GA_SOURCES})
INSTALL(TARGETS ga ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) INSTALL(TARGETS ga ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
###################################################################################### ######################################################################################
### 3) Optionnal ### 3) Optionnal

2
eo/src/pyeo/CMakeLists.txt
View file

@ -48,7 +48,7 @@ SET(EO_SOURCES
# shared library # shared library
ADD_LIBRARY(PyEO MODULE ${SOURCES} ${EO_SOURCES}) ADD_LIBRARY(PyEO MODULE ${SOURCES} ${EO_SOURCES})
INSTALL(TARGETS PyEO LIBRARY DESTINATION local/${LIB} COMPONENT libraries) INSTALL(TARGETS PyEO LIBRARY DESTINATION ${LIB} COMPONENT libraries)
# python 2.5 must have pyd # python 2.5 must have pyd
IF(WIN32 AND NOT CYGWIN) IF(WIN32 AND NOT CYGWIN)

2
eo/src/utils/CMakeLists.txt
View file

@ -33,7 +33,7 @@ SET(EOUTILS_SOURCES
) )
ADD_LIBRARY(eoutils STATIC ${EOUTILS_SOURCES}) ADD_LIBRARY(eoutils STATIC ${EOUTILS_SOURCES})
INSTALL(TARGETS eoutils ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) INSTALL(TARGETS eoutils ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
###################################################################################### ######################################################################################

2
eo/test/CMakeLists.txt
View file

@ -93,7 +93,7 @@ ELSEIF(ENABLE_CMAKE_TESTING)
ADD_EXECUTABLE(${test} ${T_${test}_SOURCES}) ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})
ADD_TEST(${test} ${test}) ADD_TEST(${test} ${test})
TARGET_LINK_LIBRARIES(${test} ga es cma eoutils eo) TARGET_LINK_LIBRARIES(${test} ga es cma eoutils eo)
INSTALL(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/test COMPONENT test) INSTALL(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/test COMPONENT test)
ENDFOREACH (test) ENDFOREACH (test)
SET(RESOURCES SET(RESOURCES

16
eo/tutorial/CMakeLists.txt
View file

@ -2,15 +2,11 @@
### 1) Where must cmake go now ? ### 1) Where must cmake go now ?
###################################################################################### ######################################################################################
IF(ENABLE_EO_TUTORIAL) ADD_SUBDIRECTORY(Lesson1)
ADD_SUBDIRECTORY(Lesson2)
ADD_SUBDIRECTORY(Lesson1) ADD_SUBDIRECTORY(Lesson3)
ADD_SUBDIRECTORY(Lesson2) ADD_SUBDIRECTORY(Lesson4)
ADD_SUBDIRECTORY(Lesson3) ADD_SUBDIRECTORY(Lesson5)
ADD_SUBDIRECTORY(Lesson4) ADD_SUBDIRECTORY(Lesson6)
ADD_SUBDIRECTORY(Lesson5)
ADD_SUBDIRECTORY(Lesson6)
ENDIF()
###################################################################################### ######################################################################################

6
eo/tutorial/Lesson1/CMakeLists.txt
View file

@ -57,8 +57,8 @@ TARGET_LINK_LIBRARIES(exercise1.3 ga eo eoutils)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
INSTALL(TARGETS FirstBitGA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples) INSTALL(TARGETS FirstBitGA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples)
INSTALL(TARGETS FirstRealGA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples) INSTALL(TARGETS FirstRealGA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples)
INSTALL(TARGETS exercise1.3 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples) INSTALL(TARGETS exercise1.3 RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples)
###################################################################################### ######################################################################################

6
eo/tutorial/Lesson2/CMakeLists.txt
View file

@ -53,8 +53,8 @@ TARGET_LINK_LIBRARIES(exercise2.3 ga eo eoutils)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
INSTALL(TARGETS FirstBitEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples) INSTALL(TARGETS FirstBitEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
INSTALL(TARGETS FirstRealEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples) INSTALL(TARGETS FirstRealEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
INSTALL(TARGETS exercise2.3 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples) INSTALL(TARGETS exercise2.3 RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
###################################################################################### ######################################################################################

6
eo/tutorial/Lesson3/CMakeLists.txt
View file

@ -57,8 +57,8 @@ TARGET_LINK_LIBRARIES(exercise3.1 ga eoutils eo)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
INSTALL(TARGETS SecondBitEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples) INSTALL(TARGETS SecondBitEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
INSTALL(TARGETS SecondRealEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples) INSTALL(TARGETS SecondRealEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
INSTALL(TARGETS exercise3.1 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples) INSTALL(TARGETS exercise3.1 RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
###################################################################################### ######################################################################################

6
eo/tutorial/Lesson4/CMakeLists.txt
View file

@ -91,8 +91,8 @@ TARGET_LINK_LIBRARIES(ESEA es ga eo eoutils)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
INSTALL(TARGETS BitEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples) INSTALL(TARGETS BitEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
INSTALL(TARGETS RealEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples) INSTALL(TARGETS RealEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
INSTALL(TARGETS ESEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples) INSTALL(TARGETS ESEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
###################################################################################### ######################################################################################

4
eo/tutorial/Lesson5/CMakeLists.txt
View file

@ -50,7 +50,7 @@ TARGET_LINK_LIBRARIES(OneMaxLibEA es ga eo eoutils)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
INSTALL(TARGETS OneMaxEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples) INSTALL(TARGETS OneMaxEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples)
INSTALL(TARGETS OneMaxLibEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples) INSTALL(TARGETS OneMaxLibEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples)
###################################################################################### ######################################################################################

4
eo/tutorial/Lesson6/CMakeLists.txt
View file

@ -45,7 +45,7 @@ TARGET_LINK_LIBRARIES(RealPSO eo eoutils)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
INSTALL(TARGETS BinaryPSO RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples) INSTALL(TARGETS BinaryPSO RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples)
INSTALL(TARGETS RealPSO RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples) INSTALL(TARGETS RealPSO RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples)
###################################################################################### ######################################################################################

2
mo/doc/CMakeLists.txt
View file

@ -23,7 +23,7 @@ if(DOXYGEN_FOUND)
"${MO_DOC_DIR}/${MO_DOC_CONFIG_FILE}") "${MO_DOC_DIR}/${MO_DOC_CONFIG_FILE}")
install( install(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DESTINATION local/share${INSTALL_SUB_DIR}/mo COMPONENT doc DESTINATION share${INSTALL_SUB_DIR}/mo COMPONENT doc
PATTERN "CMakeFiles" EXCLUDE PATTERN "CMakeFiles" EXCLUDE
PATTERN "cmake_install.cmake" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE
PATTERN "CTestTestfile.cmake" EXCLUDE PATTERN "CTestTestfile.cmake" EXCLUDE

6
mo/src/CMakeLists.txt
View file

@ -3,14 +3,14 @@
###################################################################################### ######################################################################################
file(GLOB HDRS *.h mo) file(GLOB HDRS *.h mo)
install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/mo COMPONENT headers) install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/mo COMPONENT headers)
###################################################################################### ######################################################################################
### 1) Install directories ### 1) Install directories
###################################################################################### ######################################################################################
install(DIRECTORY acceptCrit algo comparator continuator coolingSchedule eval eplorer memory neighborhood perturb problems sampling install(DIRECTORY acceptCrit algo comparator continuator coolingSchedule eval explorer memory neighborhood perturb problems sampling
DESTINATION local/include${INSTALL_SUB_DIR}/mo DESTINATION include${INSTALL_SUB_DIR}/mo
COMPONENT headers COMPONENT headers
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
) )

2
mo/test/CMakeLists.txt
View file

@ -106,7 +106,7 @@ foreach (test ${TEST_LIST})
add_executable(${test} ${T_${test}_SOURCES}) add_executable(${test} ${T_${test}_SOURCES})
add_test(${test} ${test}) add_test(${test} ${test})
target_link_libraries(${test} ga es eoutils eo) target_link_libraries(${test} ga es eoutils eo)
install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/mo/test COMPONENT tests) install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/mo/test COMPONENT tests)
endforeach (test) endforeach (test)

2
moeo/doc/CMakeLists.txt
View file

@ -26,7 +26,7 @@ if(DOXYGEN_FOUND)
"${MOEO_DOC_DIR}/${MOEO_DOC_CONFIG_FILE}") "${MOEO_DOC_DIR}/${MOEO_DOC_CONFIG_FILE}")
install( install(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DESTINATION local/share${INSTALL_SUB_DIR}/moeo COMPONENT doc DESTINATION share${INSTALL_SUB_DIR}/moeo COMPONENT doc
PATTERN "CMakeFiles" EXCLUDE PATTERN "CMakeFiles" EXCLUDE
PATTERN "cmake_install.cmake" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE
PATTERN "CTestTestfile.cmake" EXCLUDE PATTERN "CTestTestfile.cmake" EXCLUDE

6
moeo/src/CMakeLists.txt
View file

@ -23,21 +23,21 @@ add_library(moeo STATIC ${MOEO_CORE})
set(MOEO_VERSION ${GLOBAL_VERSION}) set(MOEO_VERSION ${GLOBAL_VERSION})
set_target_properties(moeo PROPERTIES VERSION "${MOEO_VERSION}") set_target_properties(moeo PROPERTIES VERSION "${MOEO_VERSION}")
install(TARGETS moeo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) install(TARGETS moeo ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
###################################################################################### ######################################################################################
### 3) Look for headers ### 3) Look for headers
###################################################################################### ######################################################################################
file(GLOB HDRS moeo) file(GLOB HDRS moeo)
install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/moeo COMPONENT headers) install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/moeo COMPONENT headers)
###################################################################################### ######################################################################################
### 4) Install directories ### 4) Install directories
###################################################################################### ######################################################################################
install(DIRECTORY acceptCrit algo archive comparator core distance diversity do explorer fitness hybridization metric replacement scalarStuffs selection utils install(DIRECTORY acceptCrit algo archive comparator core distance diversity do explorer fitness hybridization metric replacement scalarStuffs selection utils
DESTINATION local/include${INSTALL_SUB_DIR}/moeo DESTINATION include${INSTALL_SUB_DIR}/moeo
COMPONENT headers COMPONENT headers
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
) )

2
moeo/test/CMakeLists.txt
View file

@ -82,5 +82,5 @@ foreach (test ${TEST_LIST})
add_executable(${test} ${T_${test}_SOURCES}) add_executable(${test} ${T_${test}_SOURCES})
add_test(${test} ${test}) add_test(${test} ${test})
target_link_libraries(${test} moeo ga es eoutils eo) target_link_libraries(${test} moeo ga es eoutils eo)
install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/moeo/test COMPONENT tests) install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/moeo/test COMPONENT tests)
endforeach (test) endforeach (test)

6
moeo/tutorial/examples/flowshop/CMakeLists.txt
View file

@ -33,17 +33,17 @@ add_dependencies(flowshop moeo)
target_link_libraries(flowshop eo) target_link_libraries(flowshop eo)
install(TARGETS flowshop ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) install(TARGETS flowshop ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
###################################################################################### ######################################################################################
### 5) Installing benchs ### 5) Installing benchs
###################################################################################### ######################################################################################
install(DIRECTORY benchs DESTINATION local/include${INSTALL_SUB_DIR}/moeo/tutorial/flowshop COMPONENT tutorial) install(DIRECTORY benchs DESTINATION include${INSTALL_SUB_DIR}/moeo/tutorial/flowshop COMPONENT tutorial)
###################################################################################### ######################################################################################
### 6) Look for headers ### 6) Look for headers
###################################################################################### ######################################################################################
file(GLOB HDRS *.h) file(GLOB HDRS *.h)
install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/moeo/tutorial/examples/flowshop COMPONENT headers) install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/moeo/tutorial/examples/flowshop COMPONENT headers)

2
smp/doc/CMakeLists.txt
View file

@ -23,7 +23,7 @@ if(DOXYGEN_FOUND)
"${SMP_DOC_DIR}/${SMP_DOC_CONFIG_FILE}") "${SMP_DOC_DIR}/${SMP_DOC_CONFIG_FILE}")
install( install(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DESTINATION local/share${INSTALL_SUB_DIR}/smp COMPONENT doc DESTINATION share${INSTALL_SUB_DIR}/smp COMPONENT doc
PATTERN "CMakeFiles" EXCLUDE PATTERN "CMakeFiles" EXCLUDE
PATTERN "cmake_install.cmake" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE
PATTERN "CTestTestfile.cmake" EXCLUDE PATTERN "CTestTestfile.cmake" EXCLUDE

6
smp/src/CMakeLists.txt
View file

@ -22,21 +22,21 @@ set (SMP_FILE
add_library(smp STATIC ${SMP_FILE}) add_library(smp STATIC ${SMP_FILE})
install(TARGETS smp ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) install(TARGETS smp ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
###################################################################################### ######################################################################################
### 3) Look for headers ### 3) Look for headers
###################################################################################### ######################################################################################
file(GLOB HDRS smp *.h) file(GLOB HDRS smp *.h)
install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/smp COMPONENT headers) install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/smp COMPONENT headers)
###################################################################################### ######################################################################################
### 4) Install directories ### 4) Install directories
###################################################################################### ######################################################################################
install(DIRECTORY MWAlgo install(DIRECTORY MWAlgo
DESTINATION local/include${INSTALL_SUB_DIR}/smp DESTINATION include${INSTALL_SUB_DIR}/smp
COMPONENT headers COMPONENT headers
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
) )

4
smp/test/CMakeLists.txt
View file

@ -27,11 +27,11 @@ foreach (test ${TEST_LIST})
add_executable(${test} ${T_${test}_SOURCES}) add_executable(${test} ${T_${test}_SOURCES})
target_link_libraries(${test} smp eo eoutils) target_link_libraries(${test} smp eo eoutils)
add_test(${test} ${test}) add_test(${test} ${test})
install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/smp/test COMPONENT tests) install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/smp/test COMPONENT tests)
endforeach (test) endforeach (test)
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/t-data.dat ${CMAKE_CURRENT_SOURCE_DIR}/t-data.dat
${CMAKE_CURRENT_BINARY_DIR}/t-data.dat) ${CMAKE_CURRENT_BINARY_DIR}/t-data.dat)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/t-data.dat RESSOURCE DESTINATION local/share${INSTALL_SUB_DIR}/smp/test COMPONENT tests) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/t-data.dat DESTINATION share${INSTALL_SUB_DIR}/smp/test COMPONENT tests)