Make Qt5/Qt6 versions fully coinstallable

antonio-rojas · dantti · commit 3222f30d2a7e · 2023-03-24T11:58:32.000-03:00
Add version to the include path to make Qt5 and Qt6 versions coinstallable
diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
@@ -193,7 +193,7 @@ install(TARGETS QXlsx
     EXPORT ${EXPORT_NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsxQt${QT_VERSION_MAJOR} COMPONENT devel
 )
 
 install(EXPORT ${EXPORT_NAME}Targets

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ install(TARGETS QXlsx`
`193`	`193`	`EXPORT ${EXPORT_NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}`
`194`	`194`	`RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime`
`195`	`195`	`ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel`
`196`		`- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel`
	`196`	`+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsxQt${QT_VERSION_MAJOR} COMPONENT devel`
`197`	`197`	`)`
`198`	`198`
`199`	`199`	`install(EXPORT ${EXPORT_NAME}Targets`