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

Fix the bus in install location which is now determine by the OS

Browse source
This commit is contained in:
quemy 2012-11-03 18:44:19 +01:00
commit f83191bedd
33 changed files with 56 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
peo/doc/CMakeLists.txt
View file

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

4
peo/src/CMakeLists.txt
View file

@ -10,14 +10,14 @@ add_subdirectory(rmc)
######################################################################################
file(GLOB HDRS peo)
install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/peo COMPONENT headers)
install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/peo COMPONENT headers)
######################################################################################
### 2) Install directories
######################################################################################
install(DIRECTORY core rmc
DESTINATION local/include${INSTALL_SUB_DIR}/peo
DESTINATION include${INSTALL_SUB_DIR}/peo
COMPONENT headers
FILES_MATCHING PATTERN "*.h"
)

2
peo/src/core/CMakeLists.txt
View file

@ -30,4 +30,4 @@ set(CORE_SOURCES peo_init.cpp
add_library(peo STATIC ${CORE_SOURCES})
install(TARGETS peo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
install(TARGETS peo ARCHIVE DESTINATION ${LIB} COMPONENT libraries)

2
peo/src/rmc/mpi/CMakeLists.txt
View file

@ -39,4 +39,4 @@ set (RMC_MPI_SOURCES node.cpp
add_library(rmc_mpi STATIC ${RMC_MPI_SOURCES})
add_dependencies(rmc_mpi peo)
install(TARGETS rmc_mpi ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
install(TARGETS rmc_mpi ARCHIVE DESTINATION ${LIB} COMPONENT libraries)

2
peo/test/CMakeLists.txt
View file

@ -45,7 +45,7 @@ execute_process(
foreach (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
set("T_${test}_SOURCES" "${test}.cpp")
add_executable(${test} ${T_${test}_SOURCES})
install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/peo/test COMPONENT tests)
install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/peo/test COMPONENT tests)
endforeach (test)
foreach (testrun ${TEST_RUN})

2
peo/tutorial/CMakeLists.txt
View file

@ -17,4 +17,4 @@ execute_process(
${CMAKE_CURRENT_SOURCE_DIR}/benchs
${CMAKE_CURRENT_BINARY_DIR}/benchs)
install(DIRECTORY benchs DESTINATION local/include${INSTALL_SUB_DIR}/peo/tutorial COMPONENT tutorial)
install(DIRECTORY benchs DESTINATION include${INSTALL_SUB_DIR}/peo/tutorial COMPONENT tutorial)