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
mo/doc/CMakeLists.txt
View file

@ -23,7 +23,7 @@ if(DOXYGEN_FOUND)
"${MO_DOC_DIR}/${MO_DOC_CONFIG_FILE}")
install(
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 "cmake_install.cmake" EXCLUDE
PATTERN "CTestTestfile.cmake" EXCLUDE

6
mo/src/CMakeLists.txt
View file

@ -3,14 +3,14 @@
######################################################################################
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
######################################################################################
install(DIRECTORY acceptCrit algo comparator continuator coolingSchedule eval eplorer memory neighborhood perturb problems sampling
DESTINATION local/include${INSTALL_SUB_DIR}/mo
install(DIRECTORY acceptCrit algo comparator continuator coolingSchedule eval explorer memory neighborhood perturb problems sampling
DESTINATION include${INSTALL_SUB_DIR}/mo
COMPONENT headers
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_test(${test} ${test})
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)