diff --git a/edo/doc/CMakeLists.txt b/edo/doc/CMakeLists.txt index 317ea767b..435b71f75 100644 --- a/edo/doc/CMakeLists.txt +++ b/edo/doc/CMakeLists.txt @@ -26,7 +26,7 @@ if(DOXYGEN_FOUND) "${EDO_DOC_DIR}/${EDO_DOC_CONFIG_FILE}") install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DESTINATION local/share${INSTALL_SUB_DIR}/edo COMPONENT doc + DESTINATION share${INSTALL_SUB_DIR}/edo COMPONENT doc PATTERN "CMakeFiles" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE PATTERN "CTestTestfile.cmake" EXCLUDE diff --git a/edo/src/CMakeLists.txt b/edo/src/CMakeLists.txt index d8dbf1abb..8abab561b 100644 --- a/edo/src/CMakeLists.txt +++ b/edo/src/CMakeLists.txt @@ -14,7 +14,7 @@ set(LIBRARY_OUTPUT_PATH ${EDO_LIB_OUTPUT_PATH}) ###################################################################################### file(GLOB HDRS edo) -install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/edo COMPONENT headers) +install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/edo COMPONENT headers) ###################################################################################### @@ -22,7 +22,7 @@ install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/edo COMPONENT ###################################################################################### install(DIRECTORY utils - DESTINATION local/include${INSTALL_SUB_DIR}/edo + DESTINATION include${INSTALL_SUB_DIR}/edo COMPONENT headers FILES_MATCHING PATTERN "*.h" ) diff --git a/edo/src/utils/CMakeLists.txt b/edo/src/utils/CMakeLists.txt index fdd552e29..a6fc4d067 100644 --- a/edo/src/utils/CMakeLists.txt +++ b/edo/src/utils/CMakeLists.txt @@ -14,7 +14,7 @@ set(LIBRARY_OUTPUT_PATH ${EDOUTILS_LIB_OUTPUT_PATH}) file(GLOB SOURCES *.cpp) add_library(edoutils ${SOURCES}) -install(TARGETS edoutils ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) +install(TARGETS edoutils ARCHIVE DESTINATION ${LIB} COMPONENT libraries) set(EDOUTILS_VERSION ${GLOBAL_VERSION}) set_target_properties(edoutils PROPERTIES VERSION "${EDOUTILS_VERSION}") diff --git a/eo/src/CMakeLists.txt b/eo/src/CMakeLists.txt index 283fd838e..36a69c1ae 100644 --- a/eo/src/CMakeLists.txt +++ b/eo/src/CMakeLists.txt @@ -29,13 +29,13 @@ add_library(eo STATIC ${EO_SOURCES}) set(EO_VERSION ${GLOBAL_VERSION}) set_target_properties(eo PROPERTIES VERSION "${EO_VERSION}") -install(TARGETS eo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) +install(TARGETS eo ARCHIVE DESTINATION ${LIB} COMPONENT libraries) 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 - DESTINATION local/include${INSTALL_SUB_DIR}/eo + DESTINATION include${INSTALL_SUB_DIR}/eo COMPONENT headers FILES_MATCHING PATTERN "*.h" PATTERN "checkpointing" PATTERN external_eo ) diff --git a/eo/src/es/CMakeLists.txt b/eo/src/es/CMakeLists.txt index 4f924bfe6..15a7f9f3b 100644 --- a/eo/src/es/CMakeLists.txt +++ b/eo/src/es/CMakeLists.txt @@ -38,10 +38,10 @@ set(CMA_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}) -install(TARGETS cma ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) +install(TARGETS cma ARCHIVE DESTINATION ${LIB} COMPONENT libraries) ###################################################################################### ### 3) Optionnal diff --git a/eo/src/mpi/CMakeLists.txt b/eo/src/mpi/CMakeLists.txt index bed081847..ebf16335a 100644 --- a/eo/src/mpi/CMakeLists.txt +++ b/eo/src/mpi/CMakeLists.txt @@ -20,10 +20,10 @@ set(EOMPI_SOURCES ) add_library(eompi STATIC ${EOMPI_SOURCES}) -install(TARGETS eompi ARCHIVE DESTINATION local/${LIB} COMPONENT libraries) +install(TARGETS eompi ARCHIVE DESTINATION ${LIB} COMPONENT libraries) file(GLOB HDRS *.h) -install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/eo/mpi COMPONENT headers) +install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eo/mpi COMPONENT headers) ###################################################################################### ### 3) Optionnal diff --git a/eo/src/pyeo/CMakeLists.txt b/eo/src/pyeo/CMakeLists.txt index 05d5ec459..a8f6c8d54 100644 --- a/eo/src/pyeo/CMakeLists.txt +++ b/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 local/${LIB} COMPONENT libraries) +install(TARGETS PyEO LIBRARY DESTINATION ${LIB} COMPONENT libraries) # python 2.5 must have pyd if(WIN32 AND NOT CYGWIN) diff --git a/eo/src/utils/CMakeLists.txt b/eo/src/utils/CMakeLists.txt index e64cf5e4c..8e927dd4f 100644 --- a/eo/src/utils/CMakeLists.txt +++ b/eo/src/utils/CMakeLists.txt @@ -33,7 +33,7 @@ set(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) ###################################################################################### diff --git a/eo/test/CMakeLists.txt b/eo/test/CMakeLists.txt index 6f05ecde9..15fd22464 100644 --- a/eo/test/CMakeLists.txt +++ b/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 local/share${INSTALL_SUB_DIR}/eo/test COMPONENT test) + install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/test COMPONENT test) endforeach (test) set(RESOURCES diff --git a/eo/tutorial/Lesson1/CMakeLists.txt b/eo/tutorial/Lesson1/CMakeLists.txt index 96619394d..2a0beac7a 100644 --- a/eo/tutorial/Lesson1/CMakeLists.txt +++ b/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 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) +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) ######################################################################################