diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-01-27 11:01:41 +0100 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-01-27 11:01:41 +0100 |
| commit | acb5679384b30a28dc968b13211ff41db9bf0e1d (patch) | |
| tree | 351af37a1db3317a3403bb854fa74373474d8a63 /kde/cmake/marble | |
| parent | de413544c91748fee3af6728b7789af4defa864b (diff) | |
| download | ktown-acb5679384b30a28dc968b13211ff41db9bf0e1d.tar.gz ktown-acb5679384b30a28dc968b13211ff41db9bf0e1d.tar.xz | |
KDE: update the collection of cmake scripts for new/modified packages.
Diffstat (limited to 'kde/cmake/marble')
| -rw-r--r-- | kde/cmake/marble | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/kde/cmake/marble b/kde/cmake/marble index 3ad624b..f47a2f0 100644 --- a/kde/cmake/marble +++ b/kde/cmake/marble @@ -29,23 +29,26 @@ marble_configure \ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca -cd - -# Add Qt4 support (needed by libkgeomap): -mkdir build_qt4 -cd build_qt4 -QT5DIR="" \ -QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \ -marble_configure \ - -DQT_MOC_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/moc \ - -DQT_QMAKE_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/qmake \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt/plugins \ - -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt/plugins \ - -DMARBLE_PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/marble4/plugins \ - -DQT5BUILD=OFF \ - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON \ - -DCMAKE_DISABLE_FIND_PACKAGE_KF5=ON \ - -DBUILD_MARBLE_TESTS=OFF \ - -DBUILD_MARBLE_APPS=OFF - -# make can pick up from here, and first build the Qt4, then Qt5 stuff. +# +#cd - +# +## Add Qt4 support (needed by libkgeomap): +#mkdir build_qt4 +#cd build_qt4 +#QT5DIR="" \ +#QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \ +#marble_configure \ +# -DQT_MOC_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/moc \ +# -DQT_QMAKE_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/qmake \ +# -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt/plugins \ +# -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt/plugins \ +# -DMARBLE_PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/marble4/plugins \ +# -DQT5BUILD=OFF \ +# -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON \ +# -DCMAKE_DISABLE_FIND_PACKAGE_KF5=ON \ +# -DBUILD_MARBLE_TESTS=OFF \ +# -DBUILD_MARBLE_APPS=OFF +# +## make can pick up from here, and first build the Qt4, then Qt5 stuff. +# |