aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml4
-rw-r--r--data/CMakeLists.txt1
2 files changed, 3 insertions, 2 deletions
diff --git a/.build.yml b/.build.yml
index 6c7913e..8dba6fc 100644
--- a/.build.yml
+++ b/.build.yml
@@ -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})