]> jfr.im git - irc/znc/znc.git/commitdiff
Fix a warning in integration test / gmake / znc-buildmod interaction.
authorAlexey Sokolov <redacted>
Thu, 28 Jun 2018 22:57:29 +0000 (23:57 +0100)
committerAlexey Sokolov <redacted>
Thu, 28 Jun 2018 22:57:29 +0000 (23:57 +0100)
It was requested on https://github.com/gentoo/gentoo/pull/8901

test/CMakeLists.txt

index b19c22fab1e727fff15b3428b186ecacc15639db..296cb0de753f90f5bce31ae96daf263513734bf1 100644 (file)
@@ -85,5 +85,10 @@ externalproject_add(inttest_bin
        "-DZNC_BIN_DIR:path=${CMAKE_INSTALL_FULL_BINDIR}"
        "-DQt5_HINTS:path=${brew_qt5}")
 add_custom_target(inttest COMMAND
+       # Prevent a warning from test of znc-buildmod, when inner make
+       # discovers that there is an outer make and tries to use it:
+       # gmake[4]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
+       # This option doesn't affect ninja, which doesn't show that warning anyway.
+       ${CMAKE_COMMAND} -E env MAKEFLAGS=
        "${CMAKE_CURRENT_BINARY_DIR}/integration/inttest")
 add_dependencies(inttest inttest_bin)