diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-25 12:54:33 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-28 11:37:11 +0200 |
commit | 2b134d46c21c86dd1cf66ba5e9c961714d73b3b3 (patch) | |
tree | d4908ae8d78a228ad161e1237a1b0b5d3c5d98af /sources/pyside2/CMakeLists.txt | |
parent | 84597fa46a6c0134cef514f749c3f072bfe6fe14 (diff) | |
parent | 117e0ff91275b4bc06dd5383f19e7028c5ef6ff8 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I073b05f8b39c0af32aa57ce3589c1aac2d712213
Diffstat (limited to 'sources/pyside2/CMakeLists.txt')
-rw-r--r-- | sources/pyside2/CMakeLists.txt | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 1215e2598..ac4669deb 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -97,7 +97,7 @@ option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) if(CMAKE_HOST_APPLE) - set(ALTERNATIVE_QT_INCLUDE_DIR "" CACHE PATH "The Alternative value to QT_INCLUDE_DIR. Necessary to fix bug on cmake 2.8 MACOS users") + set(ALTERNATIVE_QT_INCLUDE_DIR "" CACHE PATH "Deprecated. CMake now finds the proper include dir itself.") set(OSX_USE_LIBCPP "OFF" CACHE BOOL "Explicitly link the libc++ standard library (useful for osx deployment targets lower than 10.9.") if(OSX_USE_LIBCPP) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") @@ -119,11 +119,12 @@ list(GET Qt5Core_INCLUDE_DIRS 0 QT_INCLUDE_DIR) get_target_property(QtCore_is_framework Qt5::Core FRAMEWORK) if (QtCore_is_framework) + # Get the path to the framework dir. get_filename_component(QT_FRAMEWORK_INCLUDE_DIR "${QT_INCLUDE_DIR}/../" ABSOLUTE) message(STATUS "*** QT_FRAMEWORK_INCLUDE_DIR is ${QT_FRAMEWORK_INCLUDE_DIR}") - # QT_INCLUDE_DIR points to the QtCore.framework directory, so need to adjust this to point - # to the actual include directory. + # 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) endif() @@ -145,18 +146,16 @@ else() endif() if(CMAKE_HOST_APPLE) - if (NOT QT_INCLUDE_DIR) - set(QT_INCLUDE_DIR "/Library/Frameworks") - endif() - if(NOT QT_INCLUDE_DIR AND ALTERNATIVE_QT_INCLUDE_DIR) + # ALTERNATIVE_QT_INCLUDE_DIR is deprecated, because CMake takes care of finding the proper + # include folders using the qmake found in the environment. Only use it for now in case + # something goes wrong with the cmake process. + if(ALTERNATIVE_QT_INCLUDE_DIR AND NOT QT_INCLUDE_DIR) set(QT_INCLUDE_DIR ${ALTERNATIVE_QT_INCLUDE_DIR}) endif() - string(REPLACE " " ":" QT_INCLUDE_DIR ${QT_INCLUDE_DIR}) endif() endif() message(STATUS "*** computed QT_INCLUDE_DIR as ${QT_INCLUDE_DIR}") - if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE ${SHIBOKEN_BUILD_TYPE}) endif() @@ -291,7 +290,8 @@ ENDIF() COLLECT_MODULE_IF_FOUND(TextToSpeech opt) COLLECT_MODULE_IF_FOUND(Charts opt) COLLECT_MODULE_IF_FOUND(Svg opt) -if(Qt5Designer_FOUND) +find_package(Qt5UiTools) +if(Qt5UiTools_FOUND) COLLECT_MODULE_IF_FOUND(UiTools opt) else() set(DISABLE_QtUiTools 1) @@ -373,19 +373,19 @@ add_custom_target(dist echo "Source package created at ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2.\n" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) -if (NOT SITE_PACKAGE) +if (NOT PYTHON_SITE_PACKAGES) execute_process( COMMAND ${SHIBOKEN_PYTHON_INTERPRETER} -c "if True: from distutils import sysconfig from os.path import sep print(sysconfig.get_python_lib(1, 0, prefix='${CMAKE_INSTALL_PREFIX}').replace(sep, '/')) " - OUTPUT_VARIABLE SITE_PACKAGE + OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) - if (NOT SITE_PACKAGE) + if (NOT PYTHON_SITE_PACKAGES) message(FATAL_ERROR "Could not detect Python module installation directory.") elseif (APPLE) - message(STATUS "!!! The generated bindings will be installed on ${SITE_PACKAGE}, is it right!?") + message(STATUS "!!! The generated bindings will be installed on ${PYTHON_SITE_PACKAGES}, is it right!?") endif() endif() @@ -406,7 +406,6 @@ else() endif() add_subdirectory(libpyside) -find_package(Qt5UiTools) find_package(Qt5Designer) if(Qt5UiTools_FOUND AND Qt5Designer_FOUND) add_subdirectory(plugins) |