summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-01-21 11:58:17 +0100
committer Eric Hameleers <alien@slackware.com>2015-01-21 11:58:17 +0100
commit8f1fa05e208817cef38a775fab3830ba08aed529 (patch)
treeb515708c7cdde7aee844b83ad62c17548e649a7e
parente1989598d4f3a2f5e37508a4c67331a21d39d4ed (diff)
downloadktown-8f1fa05e208817cef38a775fab3830ba08aed529.tar.gz
ktown-8f1fa05e208817cef38a775fab3830ba08aed529.tar.xz
KDE Frameworks: move Qt5 mkspecs files into Qt5 directory.
Use /usr/lib{64,}/qt5/mkspecs/ instead of /usr/mkspecs/ which is ugly.
-rw-r--r--kde/cmake/frameworks1
l---------[-rw-r--r--]kde/cmake/networkmanager-qt22
2 files changed, 2 insertions, 21 deletions
diff --git a/kde/cmake/frameworks b/kde/cmake/frameworks
index 004ade4..fd9ec67 100644
--- a/kde/cmake/frameworks
+++ b/kde/cmake/frameworks
@@ -15,6 +15,7 @@ cd build
-DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
-DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
-DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-Dlconvert_executable=/usr/lib$LIBDIRSUFFIX/qt5/bin/lconvert \
..
diff --git a/kde/cmake/networkmanager-qt b/kde/cmake/networkmanager-qt
index fd9ec67..ec699d7 100644..120000
--- a/kde/cmake/networkmanager-qt
+++ b/kde/cmake/networkmanager-qt
@@ -1,21 +1 @@
-mkdir build
-cd build
- cmake \
- $KDE_OPT_ARGS \
- -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DSYSCONF_INSTALL_DIR=/etc/kde \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
- -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -Dlconvert_executable=/usr/lib$LIBDIRSUFFIX/qt5/bin/lconvert \
- ..
-
+frameworks \ No newline at end of file