From 6c2c9888be5d579b5dc0a345973577e3a6d0048e Mon Sep 17 00:00:00 2001 From: Benjamin Buch Date: Tue, 12 Dec 2023 13:54:51 +0100 Subject: [PATCH] respect customized CMake install locations (#593) --- src/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 23848d9..1ea10b0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,7 +36,7 @@ set(ads_SRCS AutoHideTab.cpp AutoHideDockContainer.cpp PushButton.cpp - ResizeHandle.cpp + ResizeHandle.cpp ads.qrc ) set(ads_HEADERS @@ -62,7 +62,7 @@ set(ads_HEADERS AutoHideTab.h AutoHideDockContainer.h PushButton.h - ResizeHandle.h + ResizeHandle.h ) add_compile_options("$<$:/utf-8>") if (UNIX AND NOT APPLE) @@ -120,7 +120,7 @@ write_basic_package_version_file( COMPATIBILITY SameMajorVersion ) install(FILES ${ads_HEADERS} - DESTINATION include/${library_name} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name} COMPONENT headers ) install(FILES @@ -131,25 +131,25 @@ install(FILES ) install(TARGETS ${library_name} EXPORT adsTargets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - INCLUDES DESTINATION include/${library_name} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name} ) install(EXPORT adsTargets FILE adsTargets.cmake NAMESPACE ads:: - DESTINATION lib/cmake/${library_name} + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name} ) install(FILES qtadvanceddockingConfig.cmake RENAME ${library_name}Config.cmake - DESTINATION lib/cmake/${library_name} + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name} ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${library_name}ConfigVersion.cmake" - DESTINATION lib/cmake/${library_name} + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name} ) target_include_directories(${library_name} PUBLIC - $ + $ $ )