]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
CI: Fix problem with configuration when cross building with cmake
authorRalf Habacker <ralf.habacker@freenet.de>
Mon, 12 Jun 2023 17:55:05 +0000 (19:55 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Mon, 12 Jun 2023 19:36:41 +0000 (21:36 +0200)
Due to an adaptation of an rpm macro for cross-compiling with cmake, there
was a problem with the previous method of using the current directory as
the build directory. Instead, the command line options provided by cmake
are now used to define the source and build directories, which provide more
stable behavior.

Fix #455

tools/ci-build.sh

index 4115a5939d5ecda94c9bd86a1a6e85956dbb79f9..df7ada2c1be6b02fc6b99a6c85b750a0752fdbe7 100755 (executable)
@@ -437,7 +437,7 @@ case "$ci_buildsys" in
                 ;;
         esac
 
-        $cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON "$@" ..
+        $cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -S "$srcdir" -B "$builddir" "$@"
 
         ${make}
         # The test coverage for OOM-safety is too verbose to be useful on