diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-20 13:25:34 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-20 13:25:34 +0200 |
| commit | ed270745354cc92763bfad719eec3d95b29b5b44 (patch) | |
| tree | 64dc41e6cc4a61984702a05740f703fe2b3b958f | |
| parent | 3ea1fef6b8fe17583b8839a450c347199d45ba96 (diff) | |
| parent | 2ee00dd9de46c31705fb3f195b84e4ae34b90a74 (diff) | |
| download | ayatana-indicator-bluetooth-ed270745354cc92763bfad719eec3d95b29b5b44.tar.gz ayatana-indicator-bluetooth-ed270745354cc92763bfad719eec3d95b29b5b44.tar.bz2 ayatana-indicator-bluetooth-ed270745354cc92763bfad719eec3d95b29b5b44.zip | |
Merge branch 'tari01-pr/compile-gschema-during-installation'
Attributes GH PR #30: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/pull/30
| -rw-r--r-- | .build.yml | 4 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -114,7 +114,7 @@ build_scripts: - NOCONFIGURE=1 ./autogen.sh - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum - elif [ -e ./CMakeLists.txt ]; then - - if [ ${DISTRO_NAME} == "debian" ];then + - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON - else - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON @@ -140,7 +140,7 @@ build_scripts: #after_scripts: # - if [ ${BUILD_TYPE} == "scripts" ];then # - XVFB_RUN="$(which xvfb-run || true)" -# - if [ ${DISTRO_NAME} == "debian" ];then +# - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then # - if [ -e ./autogen.sh ]; then # - ${XVFB_RUN} make check # - elif [ -e ./CMakeLists.txt ]; then diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 206ae08..7008c9e 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -73,4 +73,5 @@ set (ENV{LC_ALL} "C") execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${SCHEMA_FILE_IN}" "${SCHEMA_FILE}") # let UseGSettings do the rest +set(GSETTINGS_COMPILE ON) add_schema (${SCHEMA_NAME}) |