diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-28 16:26:54 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-29 23:08:28 +0200 |
| commit | 317cfb677464a9610e4b46971e508b90f59b90f6 (patch) | |
| tree | 0313cfbc40c4d06803c36993ddfdfc0fa9ef3b93 /cmake | |
| parent | a4071c18de94e41a157642cd0dfa0f4748d531af (diff) | |
CMake: Fix CMP0100 warning for bundled harfbuzz
Add a SKIP_AUTOMOC argument to qt_add_3rdparty_library and use it in
BundledHarfbuzz.
Change-Id: Ie4aa61639a5ab64f286ac539989572a9ae6bc3d5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 025000c977..fecaf2e831 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -3515,7 +3515,7 @@ endfunction() function(qt_add_3rdparty_library target) # Process arguments: qt_parse_all_arguments(arg "qt_add_3rdparty_library" - "SHARED;MODULE;STATIC;INTERFACE;EXCEPTIONS;INSTALL" + "SHARED;MODULE;STATIC;INTERFACE;EXCEPTIONS;INSTALL;SKIP_AUTOMOC" "OUTPUT_DIRECTORY" "${__default_private_args};${__default_public_args}" ${ARGN} @@ -3574,7 +3574,9 @@ function(qt_add_3rdparty_library target) OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}" ) - qt_autogen_tools_initial_setup(${target}) + if(NOT arg_SKIP_AUTOMOC) + qt_autogen_tools_initial_setup(${target}) + endif() if(NOT arg_INTERFACE) # This property is used for super builds with static libraries. We use |