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/doc | |
| 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/doc')
| -rw-r--r-- | sources/pyside2/doc/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index 8eb4eca06..f416ec472 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt @@ -22,7 +22,7 @@ file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf ${CMAKE_CURRENT_LIST_DIR}/ # - Build include path for qdoc for shiboken # The last element of the include list is the mkspec directory containing qplatformdefs.h -list(GET Qt5Core_INCLUDE_DIRS -1 mkspecInclude) +list(GET Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS -1 mkspecInclude) configure_file("pyside-config.qdocconf.in" "${CMAKE_CURRENT_LIST_DIR}/pyside-config.qdocconf" @ONLY) file(READ "${pyside2_BINARY_DIR}/pyside2_global.h" docHeaderContents) @@ -56,8 +56,8 @@ foreach(moduleIn ${all_module_shortnames}) # -- @TODO fix this for macOS frameworks. file(APPEND "${CMAKE_CURRENT_LIST_DIR}/pyside-config.qdocconf" " -I ${QT_INCLUDE_DIR}Qt${module} \\\n" - " -I ${QT_INCLUDE_DIR}Qt${module}/${Qt5Core_VERSION} \\\n" - " -I ${QT_INCLUDE_DIR}Qt${module}/${Qt5Core_VERSION}/Qt${module} \\\n") + " -I ${QT_INCLUDE_DIR}Qt${module}/${Qt${QT_MAJOR_VERSION}Core_VERSION} \\\n" + " -I ${QT_INCLUDE_DIR}Qt${module}/${Qt${QT_MAJOR_VERSION}Core_VERSION}/Qt${module} \\\n") if (${moduleIn} STREQUAL "X11Extras") set(globalHeader "QX11Info") |