From 7230adfe2e3779ae1452a383358ff3686a677c5d Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 20 Jan 2018 02:32:21 +0000 Subject: [PATCH] Improve CMakeLists for lib to better support multiarch --- lib/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 983ea38..e67bbc5 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -2,6 +2,8 @@ ### CMakeLists for playuver lib component ### +INCLUDE(GNUInstallDirs) + INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ) set(PlaYUVer_Lib_SRCS @@ -61,7 +63,11 @@ SET_TARGET_PROPERTIES( PlaYUVerLib ) IF( NOT USE_STATIC ) - INSTALL(TARGETS PlaYUVerLib DESTINATION ${CMAKE_INSTALL_LIBDIR} ) - INSTALL(FILES ${PlaYUVer_Lib_HEADERS} DESTINATION include ) + INSTALL( TARGETS PlaYUVerLib + RUNTIME DESTINATION bin + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ) + INSTALL(FILES ${PlaYUVer_Lib_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/PlaYUVerConfig.cmake DESTINATION share/playuver ) ENDIF()