From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 10:16:58 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- src/3rdparty/freetype/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/3rdparty/freetype') diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt index 728e9371c7..48d3528546 100644 --- a/src/3rdparty/freetype/CMakeLists.txt +++ b/src/3rdparty/freetype/CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledFreetype Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledFreetype +qt_internal_add_3rdparty_library(BundledFreetype QMAKE_LIB_NAME freetype STATIC INSTALL @@ -67,36 +67,36 @@ qt_set_symbol_visibility_hidden(BundledFreetype) ## Scopes: ##################################################################### -qt_extend_target(BundledFreetype CONDITION WIN32 +qt_internal_extend_target(BundledFreetype CONDITION WIN32 SOURCES src/base/ftsystem.c ) -qt_extend_target(BundledFreetype CONDITION UNIX +qt_internal_extend_target(BundledFreetype CONDITION UNIX SOURCES builds/unix/ftsystem.c INCLUDE_DIRECTORIES builds/unix ) -qt_extend_target(BundledFreetype CONDITION QT_FEATURE_png +qt_internal_extend_target(BundledFreetype CONDITION QT_FEATURE_png DEFINES FT_CONFIG_OPTION_USE_PNG LIBRARIES WrapPNG::WrapPNG ) -qt_extend_target(BundledFreetype CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(BundledFreetype CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib INCLUDE_DIRECTORIES ../zlib/src ) -qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep +qt_internal_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep LIBRARIES Qt::Core ) -- cgit v1.2.3