diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-22 21:01:32 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-05-19 13:26:53 +0200 |
| commit | 759da6742a513fa3fb85bb6db569cff5a53a47d6 (patch) | |
| tree | e3f45a31991eac56b6ac699a6ebb8678ff168780 /src/3rdparty | |
| parent | aed7a65b8b0870d8a019f7917888587de2a66303 (diff) | |
CMake: Generate information about 3rdparty libs in module .pri files
For modules that are not yet ported to CMake and that use
QMAKE_USE += libfoo
we need to provide the information about libfoo in the qt_lib_XXX.pri
files.
Also, we now generate qt_ext_XXX.pri files for bundled 3rdparty libs.
Task-number: QTBUG-75666
Change-Id: I9e4b057a197554ecb37c294c0bf09e2a2b3aa053
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/freetype/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/3rdparty/libpng/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/3rdparty/pcre2/CMakeLists.txt | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt index 622b488c34..728e9371c7 100644 --- a/src/3rdparty/freetype/CMakeLists.txt +++ b/src/3rdparty/freetype/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_3rdparty_library(BundledFreetype + QMAKE_LIB_NAME freetype STATIC INSTALL SOURCES diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt index c2b1b6c9ae..f8d1a77a75 100644 --- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_3rdparty_library(BundledHarfbuzz + QMAKE_LIB_NAME harfbuzz STATIC SOURCES hb-dummy.cc diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index 967aac353d..a76cc629c8 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_3rdparty_library(BundledHarfbuzz + QMAKE_LIB_NAME harfbuzz STATIC SKIP_AUTOMOC # special case SOURCES diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt index d1c5cea164..24fca5d925 100644 --- a/src/3rdparty/libpng/CMakeLists.txt +++ b/src/3rdparty/libpng/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_3rdparty_library(BundledLibpng + QMAKE_LIB_NAME libpng STATIC INSTALL SOURCES diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt index b73f0bff9e..9c70d712e3 100644 --- a/src/3rdparty/pcre2/CMakeLists.txt +++ b/src/3rdparty/pcre2/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_3rdparty_library(BundledPcre2 + QMAKE_LIB_NAME pcre2 STATIC SOURCES src/config.h |