From e4671f175c6b4d055a80bb3e71112859d0801808 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 11 Aug 2021 16:19:05 +0200 Subject: [PATCH] Install the qt6 cmake targets in prefix lib/cmake/KDDockWidgets-qt6 So it does not collide with the qt5 files --- src/CMakeLists.txt | 14 +++++++------- src/KDDockWidgetsConfig.cmake.in | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 96a022fa..25e02656 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -363,21 +363,21 @@ ecm_setup_version( ${${PROJECT_NAME}_VERSION} VARIABLE_PREFIX KDDOCKWIDGETS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kddockwidgets_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDDockWidgetsConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDDockWidgets${KDDockWidgets_LIBRARY_QTID}ConfigVersion.cmake" SOVERSION ${${PROJECT_NAME}_SOVERSION} COMPATIBILITY AnyNewerVersion ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kddockwidgets_version.h" DESTINATION ${DOCKS_INCLUDES_INSTALL_PATH}/kddockwidgets) install(EXPORT kddockwidgetsTargets - FILE KDDockWidgetsTargets.cmake + FILE KDDockWidgets${KDDockWidgets_LIBRARY_QTID}Targets.cmake NAMESPACE KDAB:: - DESTINATION ${INSTALL_LIBRARY_DIR}/cmake/KDDockWidgets + DESTINATION ${INSTALL_LIBRARY_DIR}/cmake/KDDockWidgets${KDDockWidgets_LIBRARY_QTID} ) -configure_file(KDDockWidgetsConfig.cmake.in KDDockWidgetsConfig.cmake @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KDDockWidgetsConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KDDockWidgetsConfigVersion.cmake" - DESTINATION ${INSTALL_LIBRARY_DIR}/cmake/KDDockWidgets +configure_file(KDDockWidgetsConfig.cmake.in KDDockWidgets${KDDockWidgets_LIBRARY_QTID}Config.cmake @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KDDockWidgets${KDDockWidgets_LIBRARY_QTID}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KDDockWidgets${KDDockWidgets_LIBRARY_QTID}ConfigVersion.cmake" + DESTINATION ${INSTALL_LIBRARY_DIR}/cmake/KDDockWidgets${KDDockWidgets_LIBRARY_QTID} ) if(${PROJECT_NAME}_DEVELOPER_MODE) diff --git a/src/KDDockWidgetsConfig.cmake.in b/src/KDDockWidgetsConfig.cmake.in index 8e45dcf9..f0385168 100644 --- a/src/KDDockWidgetsConfig.cmake.in +++ b/src/KDDockWidgetsConfig.cmake.in @@ -21,4 +21,4 @@ if (NOT WIN32 AND NOT APPLE AND NOT EMSCRIPTEN) endif() # Add the targets file -include("${CMAKE_CURRENT_LIST_DIR}/KDDockWidgetsTargets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/KDDockWidgets@KDDockWidgets_LIBRARY_QTID@Targets.cmake")