From b312749babb1ad23bd0c7b78de3f3f53b16cf63e Mon Sep 17 00:00:00 2001 From: quemy Date: Mon, 27 Aug 2012 09:22:45 +0000 Subject: [PATCH] Install in /usr/local instead of /usr git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2724 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/cmake/Macro.cmake | 2 +- trunk/eo/CMakeLists.txt | 2 +- trunk/eo/doc/CMakeLists.txt | 2 +- trunk/eo/src/CMakeLists.txt | 6 +++--- trunk/eo/src/es/CMakeLists.txt | 4 ++-- trunk/eo/src/ga/CMakeLists.txt | 2 +- trunk/eo/src/pyeo/CMakeLists.txt | 2 +- trunk/eo/src/utils/CMakeLists.txt | 2 +- trunk/eo/test/CMakeLists.txt | 2 +- trunk/eo/tutorial/Lesson1/CMakeLists.txt | 6 +++--- trunk/eo/tutorial/Lesson2/CMakeLists.txt | 6 +++--- trunk/eo/tutorial/Lesson3/CMakeLists.txt | 6 +++--- trunk/eo/tutorial/Lesson4/CMakeLists.txt | 6 +++--- trunk/eo/tutorial/Lesson5/CMakeLists.txt | 4 ++-- trunk/eo/tutorial/Lesson6/CMakeLists.txt | 4 ++-- trunk/mo/doc/CMakeLists.txt | 2 +- trunk/mo/src/CMakeLists.txt | 4 ++-- trunk/mo/test/CMakeLists.txt | 2 +- trunk/moeo/doc/CMakeLists.txt | 2 +- trunk/moeo/src/CMakeLists.txt | 6 +++--- trunk/moeo/test/CMakeLists.txt | 2 +- trunk/moeo/tutorial/examples/flowshop/CMakeLists.txt | 6 +++--- trunk/smp/doc/CMakeLists.txt | 2 +- trunk/smp/src/CMakeLists.txt | 6 +++--- trunk/smp/test/CMakeLists.txt | 3 ++- 25 files changed, 46 insertions(+), 45 deletions(-) diff --git a/trunk/cmake/Macro.cmake b/trunk/cmake/Macro.cmake index 018c439f9..bfde799eb 100644 --- a/trunk/cmake/Macro.cmake +++ b/trunk/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 local/share${INSTALL_SUB_DIR}/${module}/tutorial/${target} COMPONENT examples) endforeach(i) # Custom target diff --git a/trunk/eo/CMakeLists.txt b/trunk/eo/CMakeLists.txt index 1e15a91bd..71005c9d7 100644 --- a/trunk/eo/CMakeLists.txt +++ b/trunk/eo/CMakeLists.txt @@ -125,7 +125,7 @@ SET(PCPREFIX "/usr") SET(PCFLAGS "-leoutils -leo -les -lga -lcma -lgcov") SET(PCINCLUDEDIR "eo") CONFIGURE_FILE(pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/eo.pc) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/eo.pc DESTINATION ${LIB}/pkgconfig COMPONENT headers) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/eo.pc DESTINATION local/${LIB}/pkgconfig COMPONENT headers) ###################################################################################### diff --git a/trunk/eo/doc/CMakeLists.txt b/trunk/eo/doc/CMakeLists.txt index d7aa864b0..ac8c13ab2 100644 --- a/trunk/eo/doc/CMakeLists.txt +++ b/trunk/eo/doc/CMakeLists.txt @@ -39,7 +39,7 @@ IF (DOXYGEN_FOUND) INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DESTINATION share${INSTALL_SUB_DIR}/eo COMPONENT doc + DESTINATION local/share${INSTALL_SUB_DIR}/eo COMPONENT doc PATTERN "CMakeFiles" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE PATTERN "Makefile" EXCLUDE diff --git a/trunk/eo/src/CMakeLists.txt b/trunk/eo/src/CMakeLists.txt index 6e1bb3e40..7042e065e 100644 --- a/trunk/eo/src/CMakeLists.txt +++ b/trunk/eo/src/CMakeLists.txt @@ -21,13 +21,13 @@ SET(EO_SOURCES ) ADD_LIBRARY(eo STATIC ${EO_SOURCES}) -INSTALL(TARGETS eo ARCHIVE DESTINATION ${LIB} COMPONENT libraries) +INSTALL(TARGETS eo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) FILE(GLOB HDRS *.h eo) -INSTALL(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eo COMPONENT headers) +INSTALL(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/eo COMPONENT headers) INSTALL(DIRECTORY do es ga gp other utils - DESTINATION include${INSTALL_SUB_DIR}/eo + DESTINATION local/include${INSTALL_SUB_DIR}/eo COMPONENT headers FILES_MATCHING PATTERN "*.h" PATTERN "checkpointing" PATTERN external_eo ) diff --git a/trunk/eo/src/es/CMakeLists.txt b/trunk/eo/src/es/CMakeLists.txt index 593f5df8f..b71260fb5 100644 --- a/trunk/eo/src/es/CMakeLists.txt +++ b/trunk/eo/src/es/CMakeLists.txt @@ -38,10 +38,10 @@ SET(CMA_SOURCES ) ADD_LIBRARY(es STATIC ${ES_SOURCES}) -INSTALL(TARGETS es ARCHIVE DESTINATION ${LIB} COMPONENT libraries) +INSTALL(TARGETS es ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) ADD_LIBRARY(cma STATIC ${CMA_SOURCES}) -INSTALL(TARGETS cma ARCHIVE DESTINATION ${LIB} COMPONENT libraries) +INSTALL(TARGETS cma ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) ###################################################################################### ### 3) Optionnal diff --git a/trunk/eo/src/ga/CMakeLists.txt b/trunk/eo/src/ga/CMakeLists.txt index ffc6683f7..22db30744 100644 --- a/trunk/eo/src/ga/CMakeLists.txt +++ b/trunk/eo/src/ga/CMakeLists.txt @@ -23,7 +23,7 @@ SET(GA_SOURCES ) ADD_LIBRARY(ga STATIC ${GA_SOURCES}) -INSTALL(TARGETS ga ARCHIVE DESTINATION ${LIB} COMPONENT libraries) +INSTALL(TARGETS ga ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) ###################################################################################### ### 3) Optionnal diff --git a/trunk/eo/src/pyeo/CMakeLists.txt b/trunk/eo/src/pyeo/CMakeLists.txt index 760283a85..697c96a16 100644 --- a/trunk/eo/src/pyeo/CMakeLists.txt +++ b/trunk/eo/src/pyeo/CMakeLists.txt @@ -48,7 +48,7 @@ SET(EO_SOURCES # shared library ADD_LIBRARY(PyEO MODULE ${SOURCES} ${EO_SOURCES}) -INSTALL(TARGETS PyEO LIBRARY DESTINATION lib COMPONENT libraries) +INSTALL(TARGETS PyEO LIBRARY DESTINATION local/${LIB} COMPONENT libraries) # python 2.5 must have pyd IF(WIN32 AND NOT CYGWIN) diff --git a/trunk/eo/src/utils/CMakeLists.txt b/trunk/eo/src/utils/CMakeLists.txt index ab1a6c826..ccb7efe81 100644 --- a/trunk/eo/src/utils/CMakeLists.txt +++ b/trunk/eo/src/utils/CMakeLists.txt @@ -33,7 +33,7 @@ SET(EOUTILS_SOURCES ) ADD_LIBRARY(eoutils STATIC ${EOUTILS_SOURCES}) -INSTALL(TARGETS eoutils ARCHIVE DESTINATION ${LIB} COMPONENT libraries) +INSTALL(TARGETS eoutils ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) ###################################################################################### diff --git a/trunk/eo/test/CMakeLists.txt b/trunk/eo/test/CMakeLists.txt index 860968ffb..ed9575e85 100644 --- a/trunk/eo/test/CMakeLists.txt +++ b/trunk/eo/test/CMakeLists.txt @@ -93,7 +93,7 @@ ELSEIF(ENABLE_CMAKE_TESTING) ADD_EXECUTABLE(${test} ${T_${test}_SOURCES}) ADD_TEST(${test} ${test}) TARGET_LINK_LIBRARIES(${test} ga es cma eoutils eo) - INSTALL(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/test COMPONENT test) + INSTALL(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/test COMPONENT test) ENDFOREACH (test) SET(RESOURCES diff --git a/trunk/eo/tutorial/Lesson1/CMakeLists.txt b/trunk/eo/tutorial/Lesson1/CMakeLists.txt index 9f707750b..bcad406f5 100644 --- a/trunk/eo/tutorial/Lesson1/CMakeLists.txt +++ b/trunk/eo/tutorial/Lesson1/CMakeLists.txt @@ -57,8 +57,8 @@ TARGET_LINK_LIBRARIES(exercise1.3 ga eo eoutils) ### 6) Configure project installation paths ###################################################################################### -INSTALL(TARGETS FirstBitGA RUNTIME DESTINATION 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 share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples) +INSTALL(TARGETS FirstBitGA RUNTIME DESTINATION local/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 exercise1.3 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples) ###################################################################################### diff --git a/trunk/eo/tutorial/Lesson2/CMakeLists.txt b/trunk/eo/tutorial/Lesson2/CMakeLists.txt index 28b4fada8..1b7c04999 100644 --- a/trunk/eo/tutorial/Lesson2/CMakeLists.txt +++ b/trunk/eo/tutorial/Lesson2/CMakeLists.txt @@ -53,8 +53,8 @@ TARGET_LINK_LIBRARIES(exercise2.3 ga eo eoutils) ### 6) Configure project installation paths ###################################################################################### -INSTALL(TARGETS FirstBitEA RUNTIME DESTINATION 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 share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples) +INSTALL(TARGETS FirstBitEA RUNTIME DESTINATION local/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 exercise2.3 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples) ###################################################################################### diff --git a/trunk/eo/tutorial/Lesson3/CMakeLists.txt b/trunk/eo/tutorial/Lesson3/CMakeLists.txt index 0d5467d45..e999e616a 100644 --- a/trunk/eo/tutorial/Lesson3/CMakeLists.txt +++ b/trunk/eo/tutorial/Lesson3/CMakeLists.txt @@ -57,8 +57,8 @@ TARGET_LINK_LIBRARIES(exercise3.1 ga eoutils eo) ### 6) Configure project installation paths ###################################################################################### -INSTALL(TARGETS SecondBitEA RUNTIME DESTINATION 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 share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples) +INSTALL(TARGETS SecondBitEA RUNTIME DESTINATION local/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 exercise3.1 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples) ###################################################################################### diff --git a/trunk/eo/tutorial/Lesson4/CMakeLists.txt b/trunk/eo/tutorial/Lesson4/CMakeLists.txt index f85b2898d..8048bdccc 100644 --- a/trunk/eo/tutorial/Lesson4/CMakeLists.txt +++ b/trunk/eo/tutorial/Lesson4/CMakeLists.txt @@ -91,8 +91,8 @@ TARGET_LINK_LIBRARIES(ESEA es ga eo eoutils) ### 6) Configure project installation paths ###################################################################################### -INSTALL(TARGETS BitEA RUNTIME DESTINATION 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 share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples) +INSTALL(TARGETS BitEA RUNTIME DESTINATION local/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 ESEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples) ###################################################################################### diff --git a/trunk/eo/tutorial/Lesson5/CMakeLists.txt b/trunk/eo/tutorial/Lesson5/CMakeLists.txt index c79c45875..011687b8a 100644 --- a/trunk/eo/tutorial/Lesson5/CMakeLists.txt +++ b/trunk/eo/tutorial/Lesson5/CMakeLists.txt @@ -50,7 +50,7 @@ TARGET_LINK_LIBRARIES(OneMaxLibEA es ga eo eoutils) ### 6) Configure project installation paths ###################################################################################### -INSTALL(TARGETS OneMaxEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples) -INSTALL(TARGETS OneMaxLibEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples) +INSTALL(TARGETS OneMaxEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples) +INSTALL(TARGETS OneMaxLibEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples) ###################################################################################### diff --git a/trunk/eo/tutorial/Lesson6/CMakeLists.txt b/trunk/eo/tutorial/Lesson6/CMakeLists.txt index b29e76fac..8614165b5 100644 --- a/trunk/eo/tutorial/Lesson6/CMakeLists.txt +++ b/trunk/eo/tutorial/Lesson6/CMakeLists.txt @@ -45,7 +45,7 @@ TARGET_LINK_LIBRARIES(RealPSO eo eoutils) ### 6) Configure project installation paths ###################################################################################### -INSTALL(TARGETS BinaryPSO RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples) -INSTALL(TARGETS RealPSO RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples) +INSTALL(TARGETS BinaryPSO RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples) +INSTALL(TARGETS RealPSO RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples) ###################################################################################### diff --git a/trunk/mo/doc/CMakeLists.txt b/trunk/mo/doc/CMakeLists.txt index 0d2692603..1709ce9cb 100755 --- a/trunk/mo/doc/CMakeLists.txt +++ b/trunk/mo/doc/CMakeLists.txt @@ -23,7 +23,7 @@ if(DOXYGEN_FOUND) "${MO_DOC_DIR}/${MO_DOC_CONFIG_FILE}") install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DESTINATION share${INSTALL_SUB_DIR}/mo COMPONENT doc + DESTINATION local/share${INSTALL_SUB_DIR}/mo COMPONENT doc PATTERN "CMakeFiles" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE PATTERN "CTestTestfile.cmake" EXCLUDE diff --git a/trunk/mo/src/CMakeLists.txt b/trunk/mo/src/CMakeLists.txt index 4dbb54274..d6e7f4185 100644 --- a/trunk/mo/src/CMakeLists.txt +++ b/trunk/mo/src/CMakeLists.txt @@ -3,14 +3,14 @@ ###################################################################################### file(GLOB HDRS *.h mo) -install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/mo COMPONENT headers) +install(FILES ${HDRS} DESTINATION local/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 include${INSTALL_SUB_DIR}/mo + DESTINATION local/include${INSTALL_SUB_DIR}/mo COMPONENT headers FILES_MATCHING PATTERN "*.h" ) diff --git a/trunk/mo/test/CMakeLists.txt b/trunk/mo/test/CMakeLists.txt index 1e600f3fc..17a34d036 100644 --- a/trunk/mo/test/CMakeLists.txt +++ b/trunk/mo/test/CMakeLists.txt @@ -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 share${INSTALL_SUB_DIR}/mo/test COMPONENT tests) + install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/mo/test COMPONENT tests) endforeach (test) diff --git a/trunk/moeo/doc/CMakeLists.txt b/trunk/moeo/doc/CMakeLists.txt index 2b3b4e109..4666a8a90 100644 --- a/trunk/moeo/doc/CMakeLists.txt +++ b/trunk/moeo/doc/CMakeLists.txt @@ -26,7 +26,7 @@ if(DOXYGEN_FOUND) "${MOEO_DOC_DIR}/${MOEO_DOC_CONFIG_FILE}") install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DESTINATION share${INSTALL_SUB_DIR}/moeo COMPONENT doc + DESTINATION local/share${INSTALL_SUB_DIR}/moeo COMPONENT doc PATTERN "CMakeFiles" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE PATTERN "CTestTestfile.cmake" EXCLUDE diff --git a/trunk/moeo/src/CMakeLists.txt b/trunk/moeo/src/CMakeLists.txt index 6c645008b..41d315caf 100644 --- a/trunk/moeo/src/CMakeLists.txt +++ b/trunk/moeo/src/CMakeLists.txt @@ -23,21 +23,21 @@ add_library(moeo STATIC ${MOEO_CORE}) set(MOEO_VERSION ${GLOBAL_VERSION}) set_target_properties(moeo PROPERTIES VERSION "${MOEO_VERSION}") -install(TARGETS moeo ARCHIVE DESTINATION ${LIB} COMPONENT libraries) +install(TARGETS moeo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) ###################################################################################### ### 3) Look for headers ###################################################################################### file(GLOB HDRS moeo) -install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/moeo COMPONENT headers) +install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/moeo COMPONENT headers) ###################################################################################### ### 4) Install directories ###################################################################################### install(DIRECTORY acceptCrit algo archive comparator core distance diversity do explorer fitness hybridization metric replacement scalarStuffs selection utils - DESTINATION include${INSTALL_SUB_DIR}/moeo + DESTINATION local/include${INSTALL_SUB_DIR}/moeo COMPONENT headers FILES_MATCHING PATTERN "*.h" ) diff --git a/trunk/moeo/test/CMakeLists.txt b/trunk/moeo/test/CMakeLists.txt index 49130ea3e..ca24363d0 100644 --- a/trunk/moeo/test/CMakeLists.txt +++ b/trunk/moeo/test/CMakeLists.txt @@ -82,5 +82,5 @@ foreach (test ${TEST_LIST}) add_executable(${test} ${T_${test}_SOURCES}) add_test(${test} ${test}) target_link_libraries(${test} moeo ga es eoutils eo) - install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/moeo/test COMPONENT tests) + install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/moeo/test COMPONENT tests) endforeach (test) diff --git a/trunk/moeo/tutorial/examples/flowshop/CMakeLists.txt b/trunk/moeo/tutorial/examples/flowshop/CMakeLists.txt index fb57c07c9..5264c2eaa 100644 --- a/trunk/moeo/tutorial/examples/flowshop/CMakeLists.txt +++ b/trunk/moeo/tutorial/examples/flowshop/CMakeLists.txt @@ -33,17 +33,17 @@ add_dependencies(flowshop moeo) target_link_libraries(flowshop eo) -install(TARGETS flowshop ARCHIVE DESTINATION ${LIB} COMPONENT libraries) +install(TARGETS flowshop ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) ###################################################################################### ### 5) Installing benchs ###################################################################################### -install(DIRECTORY benchs DESTINATION include${INSTALL_SUB_DIR}/moeo/tutorial/flowshop COMPONENT tutorial) +install(DIRECTORY benchs DESTINATION local/include${INSTALL_SUB_DIR}/moeo/tutorial/flowshop COMPONENT tutorial) ###################################################################################### ### 6) Look for headers ###################################################################################### file(GLOB HDRS *.h) -install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/moeo/tutorial/examples/flowshop COMPONENT headers) +install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/moeo/tutorial/examples/flowshop COMPONENT headers) diff --git a/trunk/smp/doc/CMakeLists.txt b/trunk/smp/doc/CMakeLists.txt index 71b9d7822..e93a9d7c5 100644 --- a/trunk/smp/doc/CMakeLists.txt +++ b/trunk/smp/doc/CMakeLists.txt @@ -23,7 +23,7 @@ if(DOXYGEN_FOUND) "${SMP_DOC_DIR}/${SMP_DOC_CONFIG_FILE}") install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DESTINATION share${INSTALL_SUB_DIR}/smp COMPONENT doc + DESTINATION local/share${INSTALL_SUB_DIR}/smp COMPONENT doc PATTERN "CMakeFiles" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE PATTERN "CTestTestfile.cmake" EXCLUDE diff --git a/trunk/smp/src/CMakeLists.txt b/trunk/smp/src/CMakeLists.txt index a7b9a268c..dafbaa3eb 100644 --- a/trunk/smp/src/CMakeLists.txt +++ b/trunk/smp/src/CMakeLists.txt @@ -22,21 +22,21 @@ set (SMP_FILE add_library(smp STATIC ${SMP_FILE}) -install(TARGETS smp ARCHIVE DESTINATION ${LIB} COMPONENT libraries) +install(TARGETS smp ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) ###################################################################################### ### 3) Look for headers ###################################################################################### file(GLOB HDRS smp *.h) -install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/smp COMPONENT headers) +install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/smp COMPONENT headers) ###################################################################################### ### 4) Install directories ###################################################################################### install(DIRECTORY MWAlgo - DESTINATION include${INSTALL_SUB_DIR}/smp + DESTINATION local/include${INSTALL_SUB_DIR}/smp COMPONENT headers FILES_MATCHING PATTERN "*.h" ) diff --git a/trunk/smp/test/CMakeLists.txt b/trunk/smp/test/CMakeLists.txt index 708b44636..c9f025165 100644 --- a/trunk/smp/test/CMakeLists.txt +++ b/trunk/smp/test/CMakeLists.txt @@ -27,10 +27,11 @@ foreach (test ${TEST_LIST}) add_executable(${test} ${T_${test}_SOURCES}) target_link_libraries(${test} smp eo eoutils) add_test(${test} ${test}) + install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/smp/test COMPONENT tests) endforeach (test) execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/t-data.dat ${CMAKE_CURRENT_BINARY_DIR}/t-data.dat) - +install(TARGETS ${CMAKE_CURRENT_SOURCE_DIR}/t-data.dat RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/smp/test COMPONENT tests)