diff options
| author | Tim Blechmann <tim.blechmann@qt.io> | 2025-09-09 13:45:41 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-09-11 13:50:33 +0000 |
| commit | bc9ee2a2634aa53d594c5406722513510bd3c14f (patch) | |
| tree | e4e100c89cacec1f182d2d895877064e3317ae6f | |
| parent | 1a2b7e5e9241fb94e21f5278193b9dd04ba9f29b (diff) | |
skip automoc for glslang / spirv-cross6.10
silences a ranlib warning about an empty mocs_compilation.cpp.o (and
should reduce the build complexity a little)
Pick-to: 6.9 6.8
Change-Id: I34bf2dda8d915cecf8c642a42edd036dd09ac9f2
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 3b8410c30fb84e8c90f36809cc0c3ab0cb1f883c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/SPIRV-Cross/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/glslang/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/SPIRV-Cross/CMakeLists.txt b/src/SPIRV-Cross/CMakeLists.txt index 1513f15..4f2e7d2 100644 --- a/src/SPIRV-Cross/CMakeLists.txt +++ b/src/SPIRV-Cross/CMakeLists.txt @@ -9,6 +9,7 @@ qt_internal_add_3rdparty_library(BundledSpirv_Cross QMAKE_LIB_NAME spirv_cross + SKIP_AUTOMOC STATIC EXCEPTIONS SOURCES diff --git a/src/glslang/CMakeLists.txt b/src/glslang/CMakeLists.txt index 8c38313..b3b1250 100644 --- a/src/glslang/CMakeLists.txt +++ b/src/glslang/CMakeLists.txt @@ -10,6 +10,7 @@ qt_internal_add_3rdparty_library(BundledGlslang_Spirv QMAKE_LIB_NAME glslang_spirv STATIC + SKIP_AUTOMOC SOURCES ../3rdparty/glslang/SPIRV/GlslangToSpv.cpp ../3rdparty/glslang/SPIRV/InReadableOrder.cpp @@ -58,6 +59,7 @@ endif() qt_internal_add_3rdparty_library(BundledGlslang_Osdependent QMAKE_LIB_NAME glslang_osdependent STATIC + SKIP_AUTOMOC SOURCES ${GLSLANG_OSDEP_PATH}/ossource.cpp # special case INCLUDE_DIRECTORIES @@ -102,6 +104,7 @@ qt_internal_extend_target(BundledGlslang_Osdependent CONDITION LINUX qt_internal_add_3rdparty_library(BundledGlslang_Glslang QMAKE_LIB_NAME glslang_glslang STATIC + SKIP_AUTOMOC SOURCES ../3rdparty/glslang/glslang/GenericCodeGen/CodeGen.cpp ../3rdparty/glslang/glslang/GenericCodeGen/Link.cpp |