diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-07 07:56:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-18 15:13:21 +0200 |
| commit | 0c6e4506e5c0b6aacdf48fd777eb452d91732157 (patch) | |
| tree | 92a94c6ad5f13a1fbece06896b11763b3c830769 /sources/pyside2/cmake | |
| parent | 59352c3ed2364e09b9c4dae91bd7a16755ea4d95 (diff) | |
pyside2: Prepare build system for Qt 6
- Introduce a version variable to the CMakeLists.
- Emulate the Qt5Core_INCLUDE_DIRS, Qt5Core_LIBRARIES variables
by retrieving them from the INTERFACE
- Raise the language level
Task-number: PYSIDE-904
Change-Id: Ie4e43e7e6a9a2631d666038b80f306e2d9af47b1
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/cmake')
| -rw-r--r-- | sources/pyside2/cmake/Macros/FindQt5Extra.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/cmake/Macros/FindQt5Extra.cmake b/sources/pyside2/cmake/Macros/FindQt5Extra.cmake index 6bfa5e074..71846e48a 100644 --- a/sources/pyside2/cmake/Macros/FindQt5Extra.cmake +++ b/sources/pyside2/cmake/Macros/FindQt5Extra.cmake @@ -4,9 +4,9 @@ # CT: maybe we can remove this. # For now, I just use the mapping to Qt5 -find_package(Qt5Multimedia) +find_package(Qt${QT_MAJOR_VERSION}Multimedia) -if (NOT Qt5Multimedia_FOUND) +if (NOT Qt${QT_MAJOR_VERSION}Multimedia_FOUND) find_path(QT_QTMULTIMEDIA_INCLUDE_DIR QtMultimedia PATHS ${QT_HEADERS_DIR}/QtMultimedia ${QT_LIBRARY_DIR}/QtMultimedia.framework/Headers |