From 09340af67273ccd36d5391707f55258e7f871dc1 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 22 Dec 2017 00:45:07 +0100 Subject: Rename the cmake defaults file 'applications5' to 'applications' This allows me to remove a bunch of symlinks later. Note that all KDE Applications are KF5 based from now on. --- kde/cmake/applications | 38 +++++++------------------------------- kde/cmake/applications5 | 23 ----------------------- 2 files changed, 7 insertions(+), 54 deletions(-) delete mode 100644 kde/cmake/applications5 diff --git a/kde/cmake/applications b/kde/cmake/applications index 05e5634..626e05d 100644 --- a/kde/cmake/applications +++ b/kde/cmake/applications @@ -1,31 +1,3 @@ -# Temporary cludge to fix badly ported applications: -for APP in \ -libkexiv2 \ -libkdcraw \ -kde-baseapps \ -kde-runtime \ -okular \ -kdegraphics-thumbnailers \ -kolourpaint \ -kopete \ -ksnapshot \ -superkaramba \ -libkcddb \ -kget \ -kdeartwork \ -kajongg \ -ksirk \ -kalzium \ -; do - if [ "$APP" = "$PKGNAME" ]; then - if ! grep -q 'cmake_minimum_required' CMakeLists.txt ; then - # Prepend a cmake_minimum_required stanza at the top, which enables - # newer cmake features which the build needs: - sed -i -e '1icmake_minimum_required(VERSION 2.8.9)\' CMakeLists.txt - fi - fi -done - mkdir build cd build cmake \ @@ -40,8 +12,12 @@ cd build -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ - -DLIBEXEC_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ - -DKDE4_BUILD_TESTS=OFF \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ .. diff --git a/kde/cmake/applications5 b/kde/cmake/applications5 deleted file mode 100644 index 626e05d..0000000 --- a/kde/cmake/applications5 +++ /dev/null @@ -1,23 +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 \ - -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ - .. - -- cgit v1.2.3