diff options
| -rwxr-xr-x | CMAKE_CONFIGURE | 4 | ||||
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | FUNCTIONS | 29 | ||||
| -rwxr-xr-x | KDE5_DEPENDS | 3 | ||||
| -rwxr-xr-x | KDE5_FUNCTIONS | 40 |
5 files changed, 76 insertions, 7 deletions
diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE new file mode 100755 index 0000000000..73089ce7af --- /dev/null +++ b/CMAKE_CONFIGURE @@ -0,0 +1,4 @@ +config_query_list CM_BUILD_TYPE 'which build type?' Release Debug RelWithDebInfo +#if is_depends_enabled $SPELL extra-cmake-modules;then + config_query_option CM_TESTS 'build tests?' n "-DBUILD_TESTING=1" "-DBUILD_TESTING=0" +#fi @@ -1,6 +1,13 @@ 2015-04-25 Thomas Orgis <sobukus@sourcemage.org> * audio-creation/musescore: new spell, for writing music scores +2015-04-25 Treeve Jelbert <treeve@sourcemage.org> + * FUNCTIONS: allow alternate prefix for cmake builds + add qt5_cmake_build + improve qt5_build + * CMAKE_CONFIGURE, KDE5_DEPENDS, KDE5_FUNCTIONS: + for forthcoming kde5 frameworks/apps + 2015-04-23 Thomas Orgis <sobukus@sourcemage.org> * utils/numactl: new spell, NUMA support * FUNCTIONS: make waf_build more robust with differing versions of waf @@ -3,16 +3,22 @@ . $GRIMOIRE/config_query_multi.function QT5DIR=$INSTALL_ROOT/opt/qt5 + qt5_build() { - export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig" - cd $SOURCE_DIRECTORY && - QMAKEPATH="$QT5DIR/bin" -# in some cases, we set a symlink to python in the source directory - PATH="$QMAKEPATH:$SOURCE_DIRECTORY:$PATH" - qmake PREFIX=$QT5DIR $OPTS *.pro && + cd $SOURCE_DIRECTORY && + PATH="$QT5DIR/bin:$PATH" + qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \ + $OPTS $SRC/*.pro && make } +function qt5_cmake_build() { + PATH="$QT5DIR/bin/:$PATH" + export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig" + cmake_build $QT5DIR +} + + #--------------------------------------------------------------------- ## This function automatically fixes any known bad paths @@ -537,7 +543,16 @@ cmake_build() { mkdir -p build && cd build && prepare_cmake_flags && - cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT"/usr \ + + if [[ -z $1 ]];then + CMAKE_INSTALL_PREFIX="$INSTALL_ROOT/usr" + else + CMAKE_INSTALL_PREFIX="$1" + fi && + + message INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX && + + cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_MANDIR=share/man \ -DCMAKE_PREFIX_PATH=share/apps/cmake/modules \ diff --git a/KDE5_DEPENDS b/KDE5_DEPENDS new file mode 100755 index 0000000000..ea4cd7bae8 --- /dev/null +++ b/KDE5_DEPENDS @@ -0,0 +1,3 @@ +depends cmake && +depends extra-cmake-modules && +depends qtbase diff --git a/KDE5_FUNCTIONS b/KDE5_FUNCTIONS new file mode 100755 index 0000000000..af5c72c667 --- /dev/null +++ b/KDE5_FUNCTIONS @@ -0,0 +1,40 @@ +export XDG_DATA_DIRS=$KF5DIR/share:/usr/share + +#--------------------------------------------------------------------- +function kde5_build() { + OPTS+=" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=1 -Wno-dev $CM_TESTS" + qt5_cmake_build +} + + +default_build() { + kde5_build +} + +#function default_install() { +# cmake_install +#} + + +# we need a default_final, default_post_remove +# so that the mime and desktop databases get updated +update_databases() { +local DD + DD=$KF5DIR +# update-mime-database takes a long time, so only do it when needed + if is_depends_enabled $SPELL;then + update-mime-database $DD/share/mime/ + fi + if [[ -e $DD/share/desktop-directories ]]; then + update-desktop-database $DD/share/desktop-directories + fi +} + +default_final() { + update_databases +} + + +default_post_remove() { + update_databases +} |