AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix CMP0100 warning for bundled harfbuzz

Browse Source 
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:
Joerg Bornemann 2020-04-28 16:26:54 +02:00
parent a4071c18de
commit 317cfb6774
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtBuild.cmake
View File

@ -3515,7 +3515,7 @@ endfunction()
function(qt_add_3rdparty_library target) function(qt_add_3rdparty_library target)
# Process arguments: # Process arguments:
qt_parse_all_arguments(arg "qt_add_3rdparty_library" 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" "OUTPUT_DIRECTORY"
"${__default_private_args};${__default_public_args}" "${__default_private_args};${__default_public_args}"
${ARGN} ${ARGN}
@ -3574,7 +3574,9 @@ function(qt_add_3rdparty_library target)
OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}" OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}"
) )
if(NOT arg_SKIP_AUTOMOC)
qt_autogen_tools_initial_setup(${target}) qt_autogen_tools_initial_setup(${target})
endif()
if(NOT arg_INTERFACE) if(NOT arg_INTERFACE)
# This property is used for super builds with static libraries. We use # This property is used for super builds with static libraries. We use

1
src/3rdparty/harfbuzz-ng/CMakeLists.txt vendored
View File

@ -6,6 +6,7 @@
qt_add_3rdparty_library(BundledHarfbuzz qt_add_3rdparty_library(BundledHarfbuzz
STATIC STATIC
SKIP_AUTOMOC # special case
SOURCES SOURCES
hb-dummy.cc hb-dummy.cc
src/hb.h src/hb.h