diff options
Diffstat (limited to 'sources/shiboken2/CMakeLists.txt')
| -rw-r--r-- | sources/shiboken2/CMakeLists.txt | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt index 3de5d3223..80e9e3ee9 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt @@ -1,7 +1,7 @@ Include(icecc.cmake) -cmake_minimum_required(VERSION 3.1) -cmake_policy(VERSION 3.1) +cmake_minimum_required(VERSION 3.16) +cmake_policy(VERSION 3.16) set(CMAKE_BUILD_TYPE Release CACHE STRING "Build Type") @@ -18,7 +18,7 @@ option(BUILD_TESTS "Build tests." TRUE) option(USE_PYTHON_VERSION "Use specific python version to build shiboken2." "") option(DISABLE_DOCSTRINGS "Disable documentation extraction." FALSE) -set (QT_MAJOR_VERSION 5) +set (QT_MAJOR_VERSION 6) message(STATUS "Using Qt ${QT_MAJOR_VERSION}") find_package(Qt${QT_MAJOR_VERSION} 5.12 REQUIRED COMPONENTS Core) @@ -91,9 +91,7 @@ if (NOT PYTHON_CONFIG_SUFFIX) set_python_config_suffix() endif() -if (NOT PYTHON_SHARED_LIBRARY_SUFFIX) - set_python_shared_library_suffix() -endif() +set(PYTHON_SHARED_LIBRARY_SUFFIX "${PYTHON_CONFIG_SUFFIX}") if (NOT PYTHON_CONFIG_SUFFIX) message(FATAL_ERROR @@ -112,13 +110,8 @@ endif() set_cmake_cxx_flags() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_TO_ASCII") -# Force usage of the C++11 standard, without a silent fallback -# to C++98 if the compiler does not support C++11. -if(${QT_MAJOR_VERSION} GREATER_EQUAL 6) - set(CMAKE_CXX_STANDARD 17) -else() - set(CMAKE_CXX_STANDARD 11) -endif() +# Force usage of the C++17 standard +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) |