diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-07-20 19:19:19 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-07-25 19:52:38 +0200 |
| commit | 82a00471acaffe947779a01f4c4a44b559671067 (patch) | |
| tree | 678911d701a06b24932f0ebea417461c3bad048d /src | |
| parent | 976539b4afe673173c480a91711a1ac953ddc2ba (diff) | |
CMake: Don't use AUTOMOC for third party libraries
None of them have Qt sources that need moc-ing.
It's also needed to circumvent an AUTOMOC + PCH issue when AUTOMOC is
enabled for a target that does not have any C++ sources, but the
target links to another target that does have C++ sources.
Pick-to: 6.4
Change-Id: Ib1b2aa766089f093117c1ba34e156dfe8b0957e6
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/freetype/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/3rdparty/libjpeg/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/3rdparty/libpng/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/3rdparty/pcre2/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/3rdparty/zlib/CMakeLists.txt | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt index 7971220e44..720a98bee1 100644 --- a/src/3rdparty/freetype/CMakeLists.txt +++ b/src/3rdparty/freetype/CMakeLists.txt @@ -61,6 +61,7 @@ endif () qt_internal_add_3rdparty_library(BundledFreetype QMAKE_LIB_NAME freetype STATIC + SKIP_AUTOMOC INSTALL SOURCES ${BASE_SRCS} diff --git a/src/3rdparty/libjpeg/CMakeLists.txt b/src/3rdparty/libjpeg/CMakeLists.txt index 8ac9110563..d1da6c6849 100644 --- a/src/3rdparty/libjpeg/CMakeLists.txt +++ b/src/3rdparty/libjpeg/CMakeLists.txt @@ -1,6 +1,7 @@ qt_internal_add_3rdparty_library(BundledLibjpeg QMAKE_LIB_NAME libjpeg STATIC + SKIP_AUTOMOC INSTALL SOURCES src/jaricom.c diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt index b3c5bab20b..95705fa47a 100644 --- a/src/3rdparty/libpng/CMakeLists.txt +++ b/src/3rdparty/libpng/CMakeLists.txt @@ -7,6 +7,7 @@ qt_internal_add_3rdparty_library(BundledLibpng QMAKE_LIB_NAME libpng STATIC + SKIP_AUTOMOC INSTALL SOURCES png.c diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt index f44d4bbd79..0b6d608cbb 100644 --- a/src/3rdparty/pcre2/CMakeLists.txt +++ b/src/3rdparty/pcre2/CMakeLists.txt @@ -7,6 +7,7 @@ qt_internal_add_3rdparty_library(BundledPcre2 QMAKE_LIB_NAME pcre2 STATIC + SKIP_AUTOMOC SOURCES src/config.h src/pcre2.h diff --git a/src/3rdparty/zlib/CMakeLists.txt b/src/3rdparty/zlib/CMakeLists.txt index 74335d9ba6..701dab7dd3 100644 --- a/src/3rdparty/zlib/CMakeLists.txt +++ b/src/3rdparty/zlib/CMakeLists.txt @@ -1,5 +1,6 @@ qt_internal_add_3rdparty_library(BundledZLIB STATIC + SKIP_AUTOMOC SOURCES src/adler32.c src/compress.c |