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>
This commit is contained in:
parent
a4071c18de
commit
317cfb6774
@ -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
|
||||
|
1
src/3rdparty/harfbuzz-ng/CMakeLists.txt
vendored
1
src/3rdparty/harfbuzz-ng/CMakeLists.txt
vendored
@ -6,6 +6,7 @@
|
||||
|
||||
qt_add_3rdparty_library(BundledHarfbuzz
|
||||
STATIC
|
||||
SKIP_AUTOMOC # special case
|
||||
SOURCES
|
||||
hb-dummy.cc
|
||||
src/hb.h
|
||||
|
Loading…
Reference in New Issue
Block a user