Mercurial > mxe-octave

annotate src/qt6-qttools-1-libclang.patch @ 7220:d3087afece14 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/gdal.mk, src/xcb.mk: disable doxygen docs
author John Donoghue <john.donoghue@ieee.org>
date Wed, 22 May 2024 10:31:54 -0400
parents a0e9deadb221
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6883
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 Don't check for libclang when building without it.
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 diff -urN qttools-everywhere-src-6.5.2/configure.cmake qttools-everywhere-src-6.5.2/configure.cmake.orig
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 --- qttools-everywhere-src-6.5.2/configure.cmake.orig 2023-07-07 14:29:26.000000000 +0200
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 +++ qttools-everywhere-src-6.5.2/configure.cmake 2023-09-29 10:39:40.324294579 +0200
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 @@ -17,7 +17,9 @@
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 # Presumably because 6.0 ClangConfig.cmake files are not good enough?
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 # In any case explicitly request a minimum version of 8.x for now, otherwise
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 # building with CMake will fail at compilation time.
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 +if (QT_FEATURE_clang)
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 qt_find_package(WrapLibClang 8 PROVIDED_TARGETS WrapLibClang::WrapLibClang)
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 +endif()
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 # special case end
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14
a0e9deadb221 Qt6 QtTools: Tolerate incomplete installation of libclang-dev on host.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 if(TARGET WrapLibClang::WrapLibClang)