Group :: Development/Tools
RPM: soqt
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: soqt-fix-cmake-3.19.patch
Download
Download
From fb8f655632bb9c9c60e0ff9fa69a5ba22d3ff99d Mon Sep 17 00:00:00 2001
From: Volker Enderlein <volkerenderlein@hotmail.com>
Date: Sat, 5 Dec 2020 20:19:24 +0100
Subject: [PATCH] Fix for CMake 3.19.1 regression (#66)
---
src/CMakeLists.txt | 39 ++++++++++++++++++++++++++-------------
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6fb5ff12..4a6b0d3c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -389,19 +389,32 @@ else()
# Install target
# ############################################################################
- install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT development
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime NAMELINK_SKIP
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT development
- #PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT development
- RESOURCE DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} COMPONENT development
- )
-
- if(SO${GUI}_BUILD_SHARED_LIBS)
- install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT development NAMELINK_ONLY)
- if(MSVC)
- install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT debug)
+ if(NOT CMAKE_VERSION VERSION_LESS 3.12)
+ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT development
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime NAMELINK_COMPONENT development
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT development
+ RESOURCE DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} COMPONENT development
+ )
+ if(SO${GUI}_BUILD_SHARED_LIBS)
+ if(MSVC)
+ install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT debug)
+ endif()
+ endif()
+ else()
+ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT development
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime NAMELINK_SKIP
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT development
+ RESOURCE DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} COMPONENT development
+ )
+ if(SO${GUI}_BUILD_SHARED_LIBS)
+ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT development NAMELINK_ONLY)
+ if(MSVC)
+ install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT debug)
+ endif()
endif()
endif()
endif()