diff options
Diffstat (limited to 'sources/pyside2/CMakeLists.txt')
-rw-r--r-- | sources/pyside2/CMakeLists.txt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index d7d17f27d..859771c0e 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -1,7 +1,7 @@ include(cmake/Macros/icecc.cmake) # this must be the first line! -cmake_minimum_required(VERSION 3.0) -cmake_policy(VERSION 3.0) +cmake_minimum_required(VERSION 3.1) +cmake_policy(VERSION 3.1) # Don't ignore targets that do not exist, inside add_dependencies calls. cmake_policy(SET CMP0046 NEW) @@ -104,6 +104,11 @@ if(CMAKE_HOST_APPLE) endif() endif() +# Force usage of the C++11 standard, without a silent fallback +# to C++98 if the compiler does not support C++11. +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + # Qt5: QT_INCLUDE_DIR does no longer exist. # On Windows, macOS, and Linux it can be computed from Qt5Core_INCLUDE_DIRS, which contains # a list of include directories. We take the first one. @@ -121,10 +126,6 @@ if (QtCore_is_framework) # QT_INCLUDE_DIR points to the QtCore.framework directory, so we need to adjust this to point # to the actual include directory, which has include files for non-framework parts of Qt. get_filename_component(QT_INCLUDE_DIR "${QT_INCLUDE_DIR}/../../include" ABSOLUTE) - - # And then we append the framework dir, to mimic the way setup.py passed that in before to - # the old shiboken parser. - set(QT_INCLUDE_DIR "${QT_INCLUDE_DIR}:${QT_FRAMEWORK_INCLUDE_DIR}") endif() if(MSVC) @@ -229,9 +230,6 @@ macro(COLLECT_MODULE_IF_FOUND shortname) if(${_name_found}) message(STATUS "module ${name} found (${ARGN})") - # Put the module at the end of pyside2_global.h - file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/PySide2/pyside2_global.h.add" - "#include \"Qt${shortname}/Qt${shortname}\"\n") # record the shortnames for the tests list(APPEND all_module_shortnames ${shortname}) else() @@ -276,7 +274,10 @@ COLLECT_MODULE_IF_FOUND(Quick opt) COLLECT_MODULE_IF_FOUND(QuickWidgets opt) COLLECT_MODULE_IF_FOUND(Script opt) COLLECT_MODULE_IF_FOUND(ScriptTools opt) +COLLECT_MODULE_IF_FOUND(TextToSpeech opt) +COLLECT_MODULE_IF_FOUND(Charts opt) COLLECT_MODULE_IF_FOUND(Svg opt) +COLLECT_MODULE_IF_FOUND(DataVisualization opt) find_package(Qt5UiTools) if(Qt5UiTools_FOUND) COLLECT_MODULE_IF_FOUND(UiTools opt) |