From 8f1fa05e208817cef38a775fab3830ba08aed529 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 21 Jan 2015 11:58:17 +0100 Subject: KDE Frameworks: move Qt5 mkspecs files into Qt5 directory. Use /usr/lib{64,}/qt5/mkspecs/ instead of /usr/mkspecs/ which is ugly. --- kde/cmake/frameworks | 1 + kde/cmake/networkmanager-qt | 22 +--------------------- 2 files changed, 2 insertions(+), 21 deletions(-) mode change 100644 => 120000 kde/cmake/networkmanager-qt (limited to 'kde/cmake') 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 deleted file mode 100644 index fd9ec67..0000000 --- a/kde/cmake/networkmanager-qt +++ /dev/null @@ -1,21 +0,0 @@ -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 \ - .. - diff --git a/kde/cmake/networkmanager-qt b/kde/cmake/networkmanager-qt new file mode 120000 index 0000000..ec699d7 --- /dev/null +++ b/kde/cmake/networkmanager-qt @@ -0,0 +1 @@ +frameworks \ No newline at end of file -- cgit v1.2.3