diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-23 14:36:03 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-23 14:36:07 +0200 |
| commit | cdf8c68066e79e25c17eb725e4a471b0b83df544 (patch) | |
| tree | 9a8ddcad64190d88102d73e8a62f9c201209a4f6 /sources/pyside2/cmake | |
| parent | 09b06dd125323609af50de3afbfd5a4352521543 (diff) | |
| parent | eefadcef3733bfcf370f67d844dd890fdaeb17a4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Ieeaa4659753416315a619d0b683a3e5a4c8ed54e
Diffstat (limited to 'sources/pyside2/cmake')
| -rw-r--r-- | sources/pyside2/cmake/Macros/PySideModules.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index e2a1bdcdb..f5c2483c3 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -138,7 +138,8 @@ macro(check_qt_class module class optional_source_files dropped_entries) set (include_file ${class}) endif () string(TOLOWER ${class} _class) - string(TOUPPER ${module} _module) + # Remove the "Qt" prefix. + string(SUBSTRING ${module} 2 -1 _module_no_qt_prefix) if (_namespace) set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide2/${module}/${_namespace}_${_class}_wrapper.cpp) else () @@ -165,9 +166,7 @@ macro(check_qt_class module class optional_source_files dropped_entries) try_compile(Q_WORKS ${CMAKE_BINARY_DIR} ${SRC_FILE} CMAKE_FLAGS - "-DLINK_LIBRARIES=${QT_${_module}_LIBRARY}" - "-DLINK_DIRECTORIES=${QT_LIBRARY_DIR}" - "-DINCLUDE_DIRECTORIES=${QT_INCLUDE_DIR};${QT_${_module}_INCLUDE_DIR}" + "-DINCLUDE_DIRECTORIES=${QT_INCLUDE_DIR};${Qt5${_module_no_qt_prefix}_INCLUDE_DIRS}" OUTPUT_VARIABLE OUTPUT) file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCheckQtClassTest.log ${OUTPUT}) |