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

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

6
smp/src/CMakeLists.txt
View file

@ -22,21 +22,21 @@ set (SMP_FILE
add_library(smp STATIC ${SMP_FILE})
install(TARGETS smp ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
install(TARGETS smp ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
######################################################################################
### 3) Look for headers
######################################################################################
file(GLOB HDRS smp *.h)
install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/smp COMPONENT headers)
install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/smp COMPONENT headers)
######################################################################################
### 4) Install directories
######################################################################################
install(DIRECTORY MWAlgo
DESTINATION local/include${INSTALL_SUB_DIR}/smp
DESTINATION include${INSTALL_SUB_DIR}/smp
COMPONENT headers
FILES_MATCHING PATTERN "*.h"
)

4
smp/test/CMakeLists.txt
View file

@ -27,11 +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)
install(TARGETS ${test} RUNTIME DESTINATION 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(FILES ${CMAKE_CURRENT_SOURCE_DIR}/t-data.datgi DESTINATION local/share${INSTALL_SUB_DIR}/smp/test COMPONENT tests)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/t-data.dat DESTINATION share${INSTALL_SUB_DIR}/smp/test COMPONENT tests)