summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/cmake/solid
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/kde/cmake/solid')
-rw-r--r--source/kde/kde/cmake/solid20
1 files changed, 9 insertions, 11 deletions
diff --git a/source/kde/kde/cmake/solid b/source/kde/kde/cmake/solid
index 7983cf159..30d5b647e 100644
--- a/source/kde/kde/cmake/solid
+++ b/source/kde/kde/cmake/solid
@@ -1,16 +1,10 @@
-#
-# Separate cmake file for solid is needed to append "-std=c99" to the
-# CMAKE_C_FLAGS, because of a bug in flex-2.6.0 which generates a C code
-# with C++-style comments. The bug has been fixed in flex 2.6.1 which
-# is not yet a part of Slackware.
-#
mkdir cmake-build
cd cmake-build
cmake \
$KDE_OPT_ARGS \
-DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -std=c99" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c99" \
+ -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 \
@@ -19,10 +13,14 @@ cd cmake-build
-DSYSCONF_INSTALL_DIR=/etc/kde \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
-DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
+ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -Dlconvert_executable=/usr/lib$LIBDIRSUFFIX/qt5/bin/lconvert \
+ -DBUILD_TESTING=OFF \
+ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \
+ -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+ -DWITH_NEW_POWER_ASYNC_API:BOOL=ON \
+ -DWITH_NEW_POWER_ASYNC_FREEDESKTOP:BOOL=ON \
+ -DWITH_NEW_SOLID_JOB:BOOL=ON \
..