Fix installation path for shared objects (#581)

On 64bit linux all shared objects should go to /usr/lib64. With this
path package maintainters should be able to override library path by
setting STLINK_LIBRARY_PATH.
pull/583/head
Karol Szuster 2017-04-05 20:48:07 +02:00 zatwierdzone przez Jerry Jacobs
rodzic 6902f473fc
commit 47ab2901b9
2 zmienionych plików z 4 dodań i 3 usunięć

Wyświetl plik

@ -3,6 +3,7 @@ project(stlink C)
set(PROJECT_DESCRIPTION "Open source version of the STMicroelectronics Stlink Tools")
set(STLINK_UDEV_RULES_DIR "/etc/udev/rules.d" CACHE PATH "Udev rules directory")
set(STLINK_MODPROBED_DIR "/etc/modprobe.d" CACHE PATH "modprobe.d directory")
set(STLINK_LIBRARY_PATH "lib/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")
option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF)
@ -108,7 +109,7 @@ else()
endif()
install(TARGETS ${STLINK_LIB_SHARED}
DESTINATION lib/${CMAKE_LIBRARY_PATH}
DESTINATION ${STLINK_LIBRARY_PATH}
)
###
@ -138,7 +139,7 @@ endif()
set_target_properties(${STLINK_LIB_STATIC} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
install(TARGETS ${STLINK_LIB_STATIC}
ARCHIVE DESTINATION lib/${CMAKE_LIBRARY_PATH}
ARCHIVE DESTINATION ${STLINK_LIBRARY_PATH}
)
###

Wyświetl plik

@ -10,5 +10,5 @@ configure_file(
)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
DESTINATION lib/${CMAKE_LIBRARY_PATH}/pkgconfig/
DESTINATION ${STLINK_LIBRARY_PATH}/pkgconfig/
)