From 7cbd908e3e4f63615c6d1da655eee6968526a229 Mon Sep 17 00:00:00 2001 From: NRK Date: Fri, 7 Mar 2025 21:06:23 +0000 Subject: [PATCH 1/3] fix install dirs --- CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5df7685..8c064a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,9 @@ include(CheckCSourceCompiles) project ( YUV C CXX ) # "C" is required even for C++ projects -cmake_minimum_required( VERSION 2.8.12 ) +cmake_minimum_required( VERSION 3.2 ) option( UNIT_TEST "Built unit tests" OFF ) +include(GNUInstallDirs) set ( ly_base_dir ${PROJECT_SOURCE_DIR} ) set ( ly_src_dir ${ly_base_dir}/source ) @@ -246,10 +247,10 @@ endif() # install the conversion tool, .so, .a, and all the header files -install ( TARGETS yuvconvert DESTINATION bin ) -install ( TARGETS ${ly_lib_static} DESTINATION lib ) -install ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib ) -install ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include ) +install ( TARGETS yuvconvert DESTINATION ${CMAKE_INSTALL_BINDIR} ) +install ( TARGETS ${ly_lib_static} DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +install ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION bin ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +install ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) # create the .deb and .rpm packages using cpack include ( CM_linux_packages.cmake ) -- 2.48.1