From 542b814f271ab904c8539b82142f983c72cacadc Mon Sep 17 00:00:00 2001 From: Matej Kenda Date: Fri, 20 Oct 2023 17:21:13 +0200 Subject: [PATCH] CMake: Use CMAKE_INSTALL_* variables from GNUInstallDirs to install libraries, binaries and other files according to GNUInstallDirs rules. (#4190) --- ActiveRecord/Compiler/CMakeLists.txt | 10 +++++----- Encodings/Compiler/CMakeLists.txt | 10 +++++----- PageCompiler/CMakeLists.txt | 10 +++++----- PageCompiler/File2Page/CMakeLists.txt | 10 +++++----- PocoDoc/CMakeLists.txt | 10 +++++----- cmake/PocoMacros.cmake | 12 ++++++------ 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/ActiveRecord/Compiler/CMakeLists.txt b/ActiveRecord/Compiler/CMakeLists.txt index db14efd63..e78e2fcc4 100644 --- a/ActiveRecord/Compiler/CMakeLists.txt +++ b/ActiveRecord/Compiler/CMakeLists.txt @@ -18,9 +18,9 @@ target_link_libraries(ActiveRecordCompiler PUBLIC Poco::Foundation Poco::Util) install( TARGETS ActiveRecordCompiler EXPORT "ActiveRecordCompiler" - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - BUNDLE DESTINATION bin - INCLUDES DESTINATION include + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/Encodings/Compiler/CMakeLists.txt b/Encodings/Compiler/CMakeLists.txt index fa4e85b9a..8c404ed0e 100644 --- a/Encodings/Compiler/CMakeLists.txt +++ b/Encodings/Compiler/CMakeLists.txt @@ -12,9 +12,9 @@ target_link_libraries(EncodingsCompiler PUBLIC Poco::Net Poco::Util) install( TARGETS EncodingsCompiler EXPORT "EncodingsCompilerTargets" - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - BUNDLE DESTINATION bin - INCLUDES DESTINATION include + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/PageCompiler/CMakeLists.txt b/PageCompiler/CMakeLists.txt index 48379ebdc..050419f9a 100644 --- a/PageCompiler/CMakeLists.txt +++ b/PageCompiler/CMakeLists.txt @@ -20,9 +20,9 @@ target_link_libraries(PageCompiler PUBLIC Poco::Net Poco::Util) install( TARGETS PageCompiler EXPORT PageCompilerTargets - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - BUNDLE DESTINATION bin - INCLUDES DESTINATION include + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/PageCompiler/File2Page/CMakeLists.txt b/PageCompiler/File2Page/CMakeLists.txt index 6b692576b..8590a2ba3 100644 --- a/PageCompiler/File2Page/CMakeLists.txt +++ b/PageCompiler/File2Page/CMakeLists.txt @@ -18,9 +18,9 @@ target_link_libraries(File2Page PUBLIC Poco::Util) install( TARGETS File2Page EXPORT File2PageTargets - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - BUNDLE DESTINATION bin - INCLUDES DESTINATION include + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/PocoDoc/CMakeLists.txt b/PocoDoc/CMakeLists.txt index 49ad7b4e5..6aea654d5 100644 --- a/PocoDoc/CMakeLists.txt +++ b/PocoDoc/CMakeLists.txt @@ -8,9 +8,9 @@ target_link_libraries(PocoDoc PUBLIC Poco::Util Poco::XML Poco::CppParser) install( TARGETS PocoDoc EXPORT PocoDocTargets - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - BUNDLE DESTINATION bin - INCLUDES DESTINATION include + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake index 0ef354e9e..e37473e2d 100644 --- a/cmake/PocoMacros.cmake +++ b/cmake/PocoMacros.cmake @@ -271,11 +271,11 @@ install( install( TARGETS "${target_name}" EXPORT "${target_name}Targets" - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - BUNDLE DESTINATION bin - INCLUDES DESTINATION include + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) if(MSVC) @@ -297,7 +297,7 @@ macro(POCO_INSTALL_PDB target_name) if("${type}" STREQUAL "SHARED_LIBRARY" OR "${type}" STREQUAL "EXECUTABLE") install( FILES $ - DESTINATION bin + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Devel OPTIONAL )