diff options
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/freetype/CMakeLists.txt | 14 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz-ng/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/3rdparty/libpng/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/3rdparty/pcre2/.prev_CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/3rdparty/pcre2/CMakeLists.txt | 12 |
6 files changed, 33 insertions, 33 deletions
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 ) diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt index b178d205d5..37b4c00784 100644 --- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledHarfbuzz Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledHarfbuzz +qt_internal_add_3rdparty_library(BundledHarfbuzz QMAKE_LIB_NAME harfbuzz STATIC SOURCES @@ -74,19 +74,19 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz) #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE: # SHAPERS = "coretext" -qt_extend_target(BundledHarfbuzz CONDITION UNIX +qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX DEFINES HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD ) -qt_extend_target(BundledHarfbuzz CONDITION WIN32 +qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32 DEFINES HB_NO_WIN1256 ) -qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype +qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype SOURCES src/hb-ot.h src/hb-ot-cff1-table.cc @@ -147,7 +147,7 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype HAVE_OT ) -qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback +qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback SOURCES src/hb-fallback-shape.cc DEFINES diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index 2f895ab4d3..37e07f2350 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledHarfbuzz Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledHarfbuzz +qt_internal_add_3rdparty_library(BundledHarfbuzz QMAKE_LIB_NAME harfbuzz STATIC SKIP_AUTOMOC # special case @@ -76,19 +76,19 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz) #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE: # SHAPERS = "coretext" -qt_extend_target(BundledHarfbuzz CONDITION UNIX +qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX DEFINES HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD ) -qt_extend_target(BundledHarfbuzz CONDITION WIN32 +qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32 DEFINES HB_NO_WIN1256 ) -qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case +qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE # special case SOURCES src/hb-ot.h src/hb-ot-cff1-table.cc @@ -149,7 +149,7 @@ qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case HAVE_OT ) -qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback +qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback SOURCES src/hb-fallback-shape.cc DEFINES diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt index 24fca5d925..9ef367563b 100644 --- a/src/3rdparty/libpng/CMakeLists.txt +++ b/src/3rdparty/libpng/CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledLibpng Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledLibpng +qt_internal_add_3rdparty_library(BundledLibpng QMAKE_LIB_NAME libpng STATIC INSTALL @@ -39,17 +39,17 @@ qt_set_symbol_visibility_hidden(BundledLibpng) ## Scopes: ##################################################################### -qt_extend_target(BundledLibpng CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(BundledLibpng CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib INCLUDE_DIRECTORIES ../zlib/src ) -qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep +qt_internal_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep LIBRARIES Qt::Core ) diff --git a/src/3rdparty/pcre2/.prev_CMakeLists.txt b/src/3rdparty/pcre2/.prev_CMakeLists.txt index 5efac810c7..e84899c227 100644 --- a/src/3rdparty/pcre2/.prev_CMakeLists.txt +++ b/src/3rdparty/pcre2/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledPcre2 Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledPcre2 +qt_internal_add_3rdparty_library(BundledPcre2 QMAKE_LIB_NAME pcre2 STATIC SOURCES @@ -52,27 +52,27 @@ qt_set_symbol_visibility_hidden(BundledPcre2) ## Scopes: ##################################################################### -qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT +qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32 DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32 DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") +qt_internal_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION WIN32 PUBLIC_DEFINES PCRE2_STATIC ) diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt index 575424c887..23b6e738cd 100644 --- a/src/3rdparty/pcre2/CMakeLists.txt +++ b/src/3rdparty/pcre2/CMakeLists.txt @@ -4,7 +4,7 @@ ## BundledPcre2 Generic Library: ##################################################################### -qt_add_3rdparty_library(BundledPcre2 +qt_internal_add_3rdparty_library(BundledPcre2 QMAKE_LIB_NAME pcre2 STATIC SOURCES @@ -52,27 +52,27 @@ qt_set_symbol_visibility_hidden(BundledPcre2) ## Scopes: ##################################################################### -qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT +qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32 DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32 DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") +qt_internal_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") DEFINES PCRE2_DISABLE_JIT ) -qt_extend_target(BundledPcre2 CONDITION WIN32 +qt_internal_extend_target(BundledPcre2 CONDITION WIN32 PUBLIC_DEFINES PCRE2_STATIC ) |