Mercurial > mxe-octave

changeset 6884:4f23ac562f62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt6 QtBase: Use default CMake generator. * src/qt6-qtbase.mk: Ninja might not be installed on the build host. Use default CMake generator instead. Upstream recommends building with Ninja. Consider depending on build-ninja instead if this change causes issues.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 29 Sep 2023 12:35:26 +0200
parents a0e9deadb221
children 35588af48c94
files src/qt6-qtbase.mk
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt6-qtbase.mk	Fri Sep 29 10:51:23 2023 +0200
+++ b/src/qt6-qtbase.mk	Fri Sep 29 12:35:26 2023 +0200
@@ -73,7 +73,6 @@
     if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \
       mkdir '$(1).native'; \
       cmake -S '$(1)' -B '$(1).native' \
-        -G Ninja \
         -DCMAKE_INSTALL_PREFIX='$(BUILD_TOOLS_PREFIX)/qt6' \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' \
         -DQT_BUILD_{TESTS,EXAMPLES,DOCS}=OFF \
@@ -87,7 +86,6 @@
     mkdir '$(1).build'
     $($(PKG)_CONFIGURE_ENV) \
     'cmake' -S '$(1)' -B '$(1).build' \
-        -G Ninja \
         $(CMAKE_CCACHE_FLAGS) \
         -DCMAKE_INSTALL_PREFIX='$(HOST_PREFIX)/qt6' \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
@@ -106,7 +104,7 @@
         -DFEATURE_pkg_config=ON \
         -DFEATURE_system_zlib=ON \
         -DFEATURE_use_gold_linker_alias=OFF \
-	$($(PKG)_CMAKE_OPTS)
+        $($(PKG)_CMAKE_OPTS)
 
     'cmake' --build '$(1).build' -j '$(JOBS)'
     'cmake' --install '$(1).build'