Fixed cmake install directories (Closes: #880389)
Thanks Andreas Beckmann <anbe@debian.org> for spotting this. Removed superflous whitespaces from changelogubuntu/cosmic experimental/0.8.0-2
parent
914a21ece4
commit
12afdf6fc7
@ -0,0 +1,33 @@
|
|||||||
|
Description: Install cmake files arch-dependend
|
||||||
|
That will prevent file conflicts described at #880389
|
||||||
|
Author: Alf Gaida <agaida@siduction.org>
|
||||||
|
|
||||||
|
Last-Update: 2017-10-31
|
||||||
|
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -213,13 +213,13 @@
|
||||||
|
|
||||||
|
install(FILES
|
||||||
|
"${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-config-version.cmake"
|
||||||
|
- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||||
|
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||||
|
COMPONENT Devel
|
||||||
|
)
|
||||||
|
|
||||||
|
install(EXPORT
|
||||||
|
"${QTERMWIDGET_LIBRARY_NAME}-targets"
|
||||||
|
- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||||
|
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||||
|
COMPONENT Devel
|
||||||
|
)
|
||||||
|
|
||||||
|
@@ -263,7 +263,7 @@
|
||||||
|
|
||||||
|
install(FILES
|
||||||
|
"${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-config.cmake"
|
||||||
|
- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||||
|
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||||
|
COMPONENT Devel
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1 @@
|
|||||||
|
fix-cmake-installdir.patch
|
Loading…
Reference in new issue