[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qtcurve] qt5: [qt5] fix install dirs
From:       Yichao Yu <yyc1992 () gmail ! com>
Date:       2015-02-26 9:43:05
Message-ID: E1YQuyH-0001An-DP () scm ! kde ! org
[Download RAW message or body]

Git commit 8f2498fa7d776eefcad8ac2093a5a2f073009f8f by Yichao Yu.
Committed on 26/02/2015 at 09:40.
Pushed by yuyichao into branch 'master'.

[qt5] fix install dirs

M  +1    -1    qt5/config/CMakeLists.txt
M  +7    -1    qt5/style/CMakeLists.txt

http://commits.kde.org/qtcurve/8f2498fa7d776eefcad8ac2093a5a2f073009f8f

diff --git a/qt5/config/CMakeLists.txt b/qt5/config/CMakeLists.txt
index f9a74c6..8e3b0d5 100644
--- a/qt5/config/CMakeLists.txt
+++ b/qt5/config/CMakeLists.txt
@@ -59,4 +59,4 @@ target_link_libraries(kstyle_qtcurve5_config
   KF5::XmlGui)
 target_link_libraries(kstyle_qtcurve5_config qtcurve-utils)
 =

-install(TARGETS kstyle_qtcurve5_config DESTINATION ${QT_PLUGIN_INSTALL_DIR=
})
+install(TARGETS kstyle_qtcurve5_config DESTINATION ${_Qt5_PLUGIN_INSTALL_D=
IR})
diff --git a/qt5/style/CMakeLists.txt b/qt5/style/CMakeLists.txt
index 49c48b5..7f65f8c 100644
--- a/qt5/style/CMakeLists.txt
+++ b/qt5/style/CMakeLists.txt
@@ -70,6 +70,12 @@ target_link_libraries(qtcurve-qt5 ${QTC_QT5_LINK_LIBS} q=
tcurve-utils)
 install(TARGETS qtcurve-qt5 LIBRARY DESTINATION ${QTCURVE_STYLE_DIR})
 =

 if(QTC_QT5_ENABLE_KDE)
+  foreach(dir DATA_INSTALL_DIR KDE_INSTALL_DATADIR CMAKE_INSTALL_DATADIR
+      SHARE_INSTALL_PREFIX KDE_INSTALL_DATAROOTDIR CMAKE_INSTALL_DATAROOTD=
IR)
+    unset(${dir})
+    unset(${dir} CACHE)
+  endforeach()
   include(KDEInstallDirs)
-  install(FILES qtcurve.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/the=
mes)
+  install(FILES qtcurve.themerc
+    DESTINATION ${KDE_INSTALL_DATADIR}/kstyle/themes)
 endif()
[prev in list] [next in list] [prev in thread] [next in thread]