diff options
| author | Fredrik Averpil <fredrik.averpil@gmail.com> | 2017-02-11 07:16:13 +0100 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2017-02-11 12:07:05 +0000 |
| commit | 2af02631f7019582d3d9cf8a1155a710bdd32e40 (patch) | |
| tree | 2eaf7fc07aa39fa3a9ff92522639fb1194704460 | |
| parent | f019879e511444be3c12ba1cb580ef54f6075578 (diff) | |
Fix PySide2 build error on CentOS 7 (qv4engine)
Some hack that makes CentOS happy.
Task-number: PYSIDE-342
Change-Id: Ibdc8ed09bf32c8788967b09bb0f816b604a00e76
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | libpyside/CMakeLists.txt | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/libpyside/CMakeLists.txt b/libpyside/CMakeLists.txt index 32efa58e..957fd08d 100644 --- a/libpyside/CMakeLists.txt +++ b/libpyside/CMakeLists.txt @@ -1,5 +1,21 @@ project(libpyside) +if(${Qt5Qml_FOUND}) +if(NOT "${Qt5Qml_PRIVATE_INCLUDE_DIRS}" MATCHES "/QtQml/") + string(REPLACE "/QtCore" "/QtQml" replaceme "${Qt5Core_PRIVATE_INCLUDE_DIRS}") + list(APPEND Qt5Qml_PRIVATE_INCLUDE_DIRS ${replaceme}) + list(REMOVE_DUPLICATES Qt5Qml_PRIVATE_INCLUDE_DIRS) +endif() +endif() +if(${Qt5Quick_FOUND}) +if(NOT "${Qt5Quick_PRIVATE_INCLUDE_DIRS}" MATCHES "/QtQuick/") + string(REPLACE "/QtCore" "/QtQuick" replaceme "${Qt5Core_PRIVATE_INCLUDE_DIRS}") + list(APPEND Qt5Quick_PRIVATE_INCLUDE_DIRS ${Qt5Qml_PRIVATE_INCLUDE_DIRS}) + list(APPEND Qt5Quick_PRIVATE_INCLUDE_DIRS ${replaceme}) + list(REMOVE_DUPLICATES Qt5Quick_PRIVATE_INCLUDE_DIRS) +endif() +endif() + if(Qt5Qml_FOUND AND Qt5Qml_PRIVATE_INCLUDE_DIRS) set(QML_INCLUDES ${Qt5Qml_INCLUDE_DIRS} ${Qt5Qml_PRIVATE_INCLUDE_DIRS}) set(QML_LIBRARIES ${Qt5Qml_LIBRARIES}) @@ -113,7 +129,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pyside2.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pyside2${pyside2_SUFFIX}.pc" @ONLY) # create cmake-config files -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide2Config.cmake.in" +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide2Config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySide2Config.cmake" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide2Config-spec.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySide2Config${SHIBOKEN_PYTHON_EXTENSION_SUFFIX}.cmake" @ONLY) @@ -126,7 +142,7 @@ install(TARGETS pyside2 EXPORT pyside2 LIBRARY DESTINATION "${LIB_INSTALL_DIR}" ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" RUNTIME DESTINATION bin) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside2${pyside2_SUFFIX}.pc" +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside2${pyside2_SUFFIX}.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide2Config.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide2-${BINDING_API_VERSION}") |