diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-26 14:26:51 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-02 13:14:57 +0000 |
| commit | db4c54756088c59e35cbe4f64bd35d7aa43f8c56 (patch) | |
| tree | f02b8d07e2aa422c3025e8fafe75d0c0c12a2f64 /sources/pyside2/CMakeLists.txt | |
| parent | 67f389a79d08f7835d7f226836008e3384e7dd77 (diff) | |
Add PySide2: Add OpenGL version functions as separate module
The OpenGL version functions produce a lot of library code, so, add
them as a separate module.
Task-number: PYSIDE-955
Change-Id: I44737f4741f0a81f46a192961173e154ae66698e
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/CMakeLists.txt')
| -rw-r--r-- | sources/pyside2/CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 1e6f017d7..e5e5ab4e7 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -173,7 +173,10 @@ include(PySideModules) macro(COLLECT_MODULE_IF_FOUND shortname) set(name "Qt5${shortname}") - + set(_qt_module_name "${name}") + if ("${shortname}" STREQUAL "OpenGLFunctions") + set(_qt_module_name "Qt5Gui") + endif() # Determine essential/optional/missing set(module_state "missing") list(FIND ALL_ESSENTIAL_MODULES "${shortname}" essentialIndex) @@ -192,12 +195,12 @@ macro(COLLECT_MODULE_IF_FOUND shortname) set(quiet_argument "QUIET") endif() - find_package(${name} ${quiet_argument}) + find_package(${_qt_module_name} ${quiet_argument}) # If package is found, _name_found will be equal to 1 - set(_name_found "${name}_FOUND") + set(_name_found "${_qt_module_name}_FOUND") # _name_dir will keep the path to the directory where the CMake rules were found # e.g: ~/qt5.9-install/qtbase/lib/cmake/Qt5Core or /usr/lib64/cmake/Qt5Core - set(_name_dir "${name}_DIR") + set(_name_dir "${_qt_module_name}_DIR") # Qt5Core will set the base path to check if all the modules are on the same # directory, to avoid CMake looking in another path. # This will be saved in a global variable at the beginning of the modules @@ -256,7 +259,7 @@ endif() # Collect all optional modules. set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia -MultimediaWidgets OpenGL Positioning Location Qml Quick QuickWidgets RemoteObjects Scxml Script ScriptTools Sensors TextToSpeech Charts Svg DataVisualization) +MultimediaWidgets OpenGL OpenGLFunctions Positioning Location Qml Quick QuickWidgets RemoteObjects Scxml Script ScriptTools Sensors TextToSpeech Charts Svg DataVisualization) find_package(Qt5UiTools) if(Qt5UiTools_FOUND) list(APPEND ALL_OPTIONAL_MODULES UiTools) |