Mentions légales du service

Skip to content
Snippets Groups Projects
Commit c4067d51 authored by PRUVOST Florent's avatar PRUVOST Florent
Browse files

change installation directories for headers, executables and docs. Make it... 

change installation directories for headers, executables and docs. Make it relative to chameleon to avoid a bloody mess in system dirs
parent 8b4d0396
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 31 deletions
cmake_modules/morse/find/FindCHAMELEON.cmake
+ 1
− 1
View file @ c4067d51
...@@ -341,7 +341,7 @@ if(NOT CHAMELEON_FOUND OR NOT CHAMELEON_LIBRARIES) ...@@ -341,7 +341,7 @@ if(NOT CHAMELEON_FOUND OR NOT CHAMELEON_LIBRARIES)
find_path(CHAMELEON_morse.h_DIRS find_path(CHAMELEON_morse.h_DIRS
NAMES morse.h NAMES morse.h
HINTS ${CHAMELEON_DIR} HINTS ${CHAMELEON_DIR}
PATH_SUFFIXES include) PATH_SUFFIXES include/chameleon)
else() else()
set(CHAMELEON_morse.h_DIRS "CHAMELEON_morse.h_DIRS-NOTFOUND") set(CHAMELEON_morse.h_DIRS "CHAMELEON_morse.h_DIRS-NOTFOUND")
find_path(CHAMELEON_morse.h_DIRS find_path(CHAMELEON_morse.h_DIRS
......
control/CMakeLists.txt
+ 1
− 1
View file @ c4067d51
...@@ -78,7 +78,7 @@ endforeach() ...@@ -78,7 +78,7 @@ endforeach()
# installation # installation
# ------------ # ------------
install(FILES ${HDR_INSTALL} install(FILES ${HDR_INSTALL}
DESTINATION include) DESTINATION include/chameleon)
### ###
### END CMakeLists.txt ### END CMakeLists.txt
......
coreblas/include/CMakeLists.txt
+ 1
− 1
View file @ c4067d51
...@@ -59,7 +59,7 @@ endforeach() ...@@ -59,7 +59,7 @@ endforeach()
# installation # installation
# ------------ # ------------
install(FILES ${HDR_INSTALL} install(FILES ${HDR_INSTALL}
DESTINATION include) DESTINATION include/chameleon)
### ###
### END CMakeLists.txt ### END CMakeLists.txt
......
docs/doxygen/CMakeLists.txt
+ 4
− 4
View file @ c4067d51
...@@ -110,11 +110,11 @@ if(DOXYGEN_EXECUTABLE) ...@@ -110,11 +110,11 @@ if(DOXYGEN_EXECUTABLE)
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../../scratch) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../../scratch)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/out/latex/refman.pdf install(FILES ${CMAKE_CURRENT_BINARY_DIR}/out/latex/refman.pdf
RENAME magma-morse-devguide-${MAGMA_VERSION_NUMBER}.pdf RENAME magma-morse-devguide-${MAGMA_VERSION_NUMBER}.pdf
DESTINATION share/pdf) DESTINATION share/chameleon/pdf)
else() else()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/out/latex/refman.pdf install(FILES ${CMAKE_CURRENT_BINARY_DIR}/out/latex/refman.pdf
RENAME magma-morse-usersguide-${MAGMA_VERSION_NUMBER}.pdf RENAME magma-morse-usersguide-${MAGMA_VERSION_NUMBER}.pdf
DESTINATION share/pdf) DESTINATION share/chameleon/pdf)
endif() endif()
endif() endif()
...@@ -122,12 +122,12 @@ if(DOXYGEN_EXECUTABLE) ...@@ -122,12 +122,12 @@ if(DOXYGEN_EXECUTABLE)
# Installation for html version # Installation for html version
# ----------------------------- # -----------------------------
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/out/html install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/out/html
DESTINATION share/doxygen) DESTINATION share/chameleon/doxygen)
# Installation for man version # Installation for man version
# ---------------------------- # ----------------------------
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/out/man install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/out/man
DESTINATION share/) DESTINATION share/chameleon)
else() else()
message(STATUS "Looking for doxygen - not found") message(STATUS "Looking for doxygen - not found")
......
docs/texinfo/CMakeLists.txt
+ 7
− 8
View file @ c4067d51
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
# @author Cedric Castagnede # @author Cedric Castagnede
# @author Emmanuel Agullo # @author Emmanuel Agullo
# @author Mathieu Faverge # @author Mathieu Faverge
# @author Florent Pruvost
# @date 13-07-2012 # @date 13-07-2012
# #
### ###
...@@ -54,7 +55,7 @@ set(FIGURES_HTML ...@@ -54,7 +55,7 @@ set(FIGURES_HTML
potri_async.png potri_async.png
morse_header.png morse_header.png
) )
foreach(_fig ${FIGURES}) foreach(_fig ${FIGURES})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/figures/${_fig} configure_file(${CMAKE_CURRENT_SOURCE_DIR}/figures/${_fig}
${CMAKE_CURRENT_BINARY_DIR}/${_fig} ${CMAKE_CURRENT_BINARY_DIR}/${_fig}
...@@ -92,17 +93,16 @@ if(MAKEINFO_COMPILER) ...@@ -92,17 +93,16 @@ if(MAKEINFO_COMPILER)
# Installation # Installation
# ------------ # ------------
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/users_guide.info install(FILES ${CMAKE_CURRENT_BINARY_DIR}/users_guide.info
DESTINATION share/info) DESTINATION share/chameleon/info)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/users_guide.html install(FILES ${CMAKE_CURRENT_BINARY_DIR}/users_guide.html
DESTINATION share/html) DESTINATION share/chameleon/html)
foreach(_fig ${FIGURES_HTML}) foreach(_fig ${FIGURES_HTML})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_fig} install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_fig}
DESTINATION share/html) DESTINATION share/chameleon/html)
endforeach() endforeach()
else(MAKEINFO_COMPILER) else(MAKEINFO_COMPILER)
message(STATUS "Looking for makeinfo - not found") message(STATUS "Looking for makeinfo - not found")
endif(MAKEINFO_COMPILER) endif(MAKEINFO_COMPILER)
# Looking for texi2dvi # Looking for texi2dvi
...@@ -122,11 +122,10 @@ if(TEXI2DVI_COMPILER AND TEX_COMPILER) ...@@ -122,11 +122,10 @@ if(TEXI2DVI_COMPILER AND TEX_COMPILER)
# Installation # Installation
# ------------ # ------------
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/users_guide.pdf install(FILES ${CMAKE_CURRENT_BINARY_DIR}/users_guide.pdf
DESTINATION share/pdf) DESTINATION share/chameleon/pdf)
else() else()
message(STATUS "Looking for texi2dvi - not found") message(STATUS "Looking for texi2dvi - not found")
endif() endif()
### ###
......
example/basic_zposv/CMakeLists.txt
+ 1
− 1
View file @ c4067d51
...@@ -118,7 +118,7 @@ foreach(_example ${EXAMPLES}) ...@@ -118,7 +118,7 @@ foreach(_example ${EXAMPLES})
set_property(TARGET ${_name_exe} PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET ${_name_exe} PROPERTY LINKER_LANGUAGE Fortran)
target_link_libraries(${_name_exe} ${libs_for_examples}) target_link_libraries(${_name_exe} ${libs_for_examples})
install(TARGETS ${_name_exe} install(TARGETS ${_name_exe}
DESTINATION ${CMAKE_INSTALL_PREFIX}/example/basic_zposv) DESTINATION lib/chameleon/example/basic_zposv)
endforeach() endforeach()
#-------- Tests --------- #-------- Tests ---------
......
example/lapack_to_morse/CMakeLists.txt
+ 2
− 2
View file @ c4067d51
...@@ -159,14 +159,14 @@ foreach(_ltm ${LTM_SOURCES}) ...@@ -159,14 +159,14 @@ foreach(_ltm ${LTM_SOURCES})
set_property(TARGET ${_name_exe} PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET ${_name_exe} PROPERTY LINKER_LANGUAGE Fortran)
target_link_libraries(${_name_exe} ${libs_for_ltm}) target_link_libraries(${_name_exe} ${libs_for_ltm})
install(TARGETS ${_name_exe} install(TARGETS ${_name_exe}
DESTINATION ${CMAKE_INSTALL_PREFIX}/example/lapack_to_morse) DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/chameleon/example/lapack_to_morse)
endforeach() endforeach()
add_executable(step0 step0.c) add_executable(step0 step0.c)
set_property(TARGET step0 PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET step0 PROPERTY LINKER_LANGUAGE Fortran)
target_link_libraries(step0 ${libs_for_step0}) target_link_libraries(step0 ${libs_for_step0})
install(TARGETS step0 install(TARGETS step0
DESTINATION ${CMAKE_INSTALL_PREFIX}/example/lapack_to_morse) DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/chameleon/example/lapack_to_morse)
#-------- Tests --------- #-------- Tests ---------
include(CTestLists.cmake) include(CTestLists.cmake)
......
include/CMakeLists.txt
+ 1
− 1
View file @ c4067d51
...@@ -79,7 +79,7 @@ endforeach() ...@@ -79,7 +79,7 @@ endforeach()
# installation # installation
# ------------ # ------------
install(FILES ${HDR_INSTALL} install(FILES ${HDR_INSTALL}
DESTINATION include) DESTINATION include/chameleon)
### ###
### END CMakeLists.txt ### END CMakeLists.txt
......
lib/pkgconfig/chameleon-quark.pc.in
+ 1
− 1
View file @ c4067d51
prefix=@CMAKE_INSTALL_PREFIX@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix} exec_prefix=${prefix}
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include includedir=${exec_prefix}/include/chameleon
Name: chameleon Name: chameleon
Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
......
lib/pkgconfig/chameleon-starpu.pc.in
+ 2
− 2
View file @ c4067d51
prefix=@CMAKE_INSTALL_PREFIX@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix} exec_prefix=${prefix}
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include includedir=${exec_prefix}/include/chameleon
Name: chameleon Name: chameleon
Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_PATCH@ Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_PATCH@
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@ Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@ Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
Requires: @CHAMELEON_PKGCONFIG_REQUIRED@ Requires: @CHAMELEON_PKGCONFIG_REQUIRED@
......
simucore/simucblas/CMakeLists.txt
+ 1
− 1
View file @ c4067d51
...@@ -56,7 +56,7 @@ set_property(TARGET simucblas PROPERTY LINKER_LANGUAGE Fortran) ...@@ -56,7 +56,7 @@ set_property(TARGET simucblas PROPERTY LINKER_LANGUAGE Fortran)
# installation # installation
# ------------ # ------------
install(FILES ${SIMUCBLAS_HDRS} install(FILES ${SIMUCBLAS_HDRS}
DESTINATION include) DESTINATION include/chameleon)
install(TARGETS simucblas install(TARGETS simucblas
DESTINATION lib) DESTINATION lib)
......
simucore/simulapacke/CMakeLists.txt
+ 1
− 1
View file @ c4067d51
...@@ -55,7 +55,7 @@ set_property(TARGET simulapacke PROPERTY LINKER_LANGUAGE Fortran) ...@@ -55,7 +55,7 @@ set_property(TARGET simulapacke PROPERTY LINKER_LANGUAGE Fortran)
# installation # installation
# ------------ # ------------
install(FILES ${SIMULAPACKE_HDRS} install(FILES ${SIMULAPACKE_HDRS}
DESTINATION include) DESTINATION include/chameleon)
install(TARGETS simulapacke install(TARGETS simulapacke
DESTINATION lib) DESTINATION lib)
......
testing/CMakeLists.txt
+ 3
− 3
View file @ c4067d51
...@@ -194,7 +194,7 @@ foreach(_precision ${CHAMELEON_PRECISION} ) ...@@ -194,7 +194,7 @@ foreach(_precision ${CHAMELEON_PRECISION} )
target_link_libraries(${_precision}testing ${libs_for_tests}) target_link_libraries(${_precision}testing ${libs_for_tests})
install(TARGETS ${_precision}testing install(TARGETS ${_precision}testing
DESTINATION ${CMAKE_INSTALL_PREFIX}/testing) DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/chameleon/testing)
endforeach() endforeach()
...@@ -207,7 +207,7 @@ if(CHAMELEON_SCHED_STARPU) ...@@ -207,7 +207,7 @@ if(CHAMELEON_SCHED_STARPU)
${CMAKE_CURRENT_BINARY_DIR}/morse_testing_starpu.py) ${CMAKE_CURRENT_BINARY_DIR}/morse_testing_starpu.py)
# install file # install file
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/morse_testing_starpu.py install(FILES ${CMAKE_CURRENT_BINARY_DIR}/morse_testing_starpu.py
DESTINATION ${CMAKE_INSTALL_PREFIX}/testing) DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/chameleon/testing)
endif() endif()
if(CHAMELEON_SCHED_QUARK) if(CHAMELEON_SCHED_QUARK)
...@@ -217,7 +217,7 @@ if(CHAMELEON_SCHED_QUARK) ...@@ -217,7 +217,7 @@ if(CHAMELEON_SCHED_QUARK)
${CMAKE_CURRENT_BINARY_DIR}/morse_testing_quark.py) ${CMAKE_CURRENT_BINARY_DIR}/morse_testing_quark.py)
# install file # install file
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/morse_testing_quark.py install(FILES ${CMAKE_CURRENT_BINARY_DIR}/morse_testing_quark.py
DESTINATION ${CMAKE_INSTALL_PREFIX}/testing) DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/chameleon/testing)
endif() endif()
#-------- Tests --------- #-------- Tests ---------
......
timing/CMakeLists.txt
+ 4
− 4
View file @ c4067d51
...@@ -189,7 +189,7 @@ if(NOT CHAMELEON_SIMULATION) ...@@ -189,7 +189,7 @@ if(NOT CHAMELEON_SIMULATION)
${HWLOC_LIBRARIES} ${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
) )
link_directories(${LAPACKE_LIBRARY_DIRS}) link_directories(${LAPACKE_LIBRARY_DIRS})
link_directories(${LAPACK_LIBRARY_DIRS}) link_directories(${LAPACK_LIBRARY_DIRS})
link_directories(${CBLAS_LIBRARY_DIRS}) link_directories(${CBLAS_LIBRARY_DIRS})
...@@ -199,12 +199,12 @@ else() ...@@ -199,12 +199,12 @@ else()
list(APPEND libs_for_timings list(APPEND libs_for_timings
coreblas coreblas
simulapacke simulapacke
simucblas simucblas
${HWLOC_LIBRARIES} ${HWLOC_LIBRARIES}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
) )
endif() endif()
link_directories(${HWLOC_LIBRARY_DIRS}) link_directories(${HWLOC_LIBRARY_DIRS})
...@@ -232,7 +232,7 @@ foreach(_timing ${TIMINGS}) ...@@ -232,7 +232,7 @@ foreach(_timing ${TIMINGS})
target_link_libraries(${_name_exe} ${libs_for_timings}) target_link_libraries(${_name_exe} ${libs_for_timings})
install(TARGETS ${_name_exe} install(TARGETS ${_name_exe}
DESTINATION ${CMAKE_INSTALL_PREFIX}/timing) DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/chameleon/timing)
endforeach() endforeach()
#-------- Tests --------- #-------- Tests ---------
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment