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

regression: local/local

Browse source
This commit is contained in:
canape 2013-01-02 11:47:17 +01:00
commit a3c6c8c16e
10 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
edo/doc/CMakeLists.txt
View file

@ -26,7 +26,7 @@ if(DOXYGEN_FOUND)
"${EDO_DOC_DIR}/${EDO_DOC_CONFIG_FILE}") "${EDO_DOC_DIR}/${EDO_DOC_CONFIG_FILE}")
install( install(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} 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 "CMakeFiles" EXCLUDE
PATTERN "cmake_install.cmake" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE
PATTERN "CTestTestfile.cmake" EXCLUDE PATTERN "CTestTestfile.cmake" EXCLUDE

4
edo/src/CMakeLists.txt
View file

@ -14,7 +14,7 @@ set(LIBRARY_OUTPUT_PATH ${EDO_LIB_OUTPUT_PATH})
###################################################################################### ######################################################################################
file(GLOB HDRS edo) 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 install(DIRECTORY utils
DESTINATION local/include${INSTALL_SUB_DIR}/edo DESTINATION include${INSTALL_SUB_DIR}/edo
COMPONENT headers COMPONENT headers
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
) )

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

@ -14,7 +14,7 @@ set(LIBRARY_OUTPUT_PATH ${EDOUTILS_LIB_OUTPUT_PATH})
file(GLOB SOURCES *.cpp) file(GLOB SOURCES *.cpp)
add_library(edoutils ${SOURCES}) 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(EDOUTILS_VERSION ${GLOBAL_VERSION})
set_target_properties(edoutils PROPERTIES VERSION "${EDOUTILS_VERSION}") set_target_properties(edoutils PROPERTIES VERSION "${EDOUTILS_VERSION}")

6
eo/src/CMakeLists.txt
View file

@ -29,13 +29,13 @@ add_library(eo STATIC ${EO_SOURCES})
set(EO_VERSION ${GLOBAL_VERSION}) set(EO_VERSION ${GLOBAL_VERSION})
set_target_properties(eo PROPERTIES VERSION "${EO_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) 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

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

@ -20,10 +20,10 @@ set(EOMPI_SOURCES
) )
add_library(eompi STATIC ${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) 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 ### 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

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)
###################################################################################### ######################################################################################