From 3939e4543ef4be6c50581d9bff77e930fb1d9d03 Mon Sep 17 00:00:00 2001 From: looooo Date: Mon, 30 Sep 2019 09:21:11 +0200 Subject: [PATCH] cmake: pyside2: we also need headers from shiboken and pyside2 --- .../FreeCAD_Helpers/SetupShibokenAndPyside.cmake | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake index 0cd35615ca..7082116d3e 100644 --- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake +++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake @@ -47,20 +47,27 @@ macro(SetupShibokenAndPyside) # to dance to be compatible with the old (<5.12) and the new versions (>=5.12) if(NOT SHIBOKEN_LIBRARY AND TARGET Shiboken2::libshiboken) get_property(SHIBOKEN_LIBRARY TARGET Shiboken2::libshiboken PROPERTY IMPORTED_LOCATION_RELEASE) + get_property(SHIBOKEN_INCLUDE_DIR TARGET Shiboken2::libshiboken PROPERTY INTERFACE_INCLUDE_DIRECTORIES) endif(NOT SHIBOKEN_LIBRARY AND TARGET Shiboken2::libshiboken) - if(NOT SHIBOKEN_LIBRARY) + if(NOT SHIBOKEN_LIBRARY AND NOT SHIBOKEN_INCLUDE_DIR) message("====================\n" "shiboken2 not found.\n" "====================\n") - endif(NOT SHIBOKEN_LIBRARY) + endif(NOT SHIBOKEN_LIBRARY AND NOT SHIBOKEN_INCLUDE_DIR) find_package(PySide2 QUIET)# REQUIRED - if(NOT PYSIDE_INCLUDE_DIR) + + if(NOT PYSIDE_LIBRARY AND TARGET PySide2::pyside2) + get_property(PYSIDE_LIBRARY TARGET PySide2::pyside2 PROPERTY IMPORTED_LOCATION_RELEASE) + get_property(PYSIDE_INCLUDE_DIR TARGET PySide2::pyside2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES) + endif(NOT PYSIDE_LIBRARY AND TARGET PySide2::pyside2) + + if(NOT PYSIDE_LIBRARY AND NOT PYSIDE_INCLUDE_DIR) message("==================\n" "PySide2 not found.\n" "==================\n") - endif(NOT PYSIDE_INCLUDE_DIR) + endif(NOT PYSIDE_LIBRARY AND NOT PYSIDE_INCLUDE_DIR) find_package(PySide2Tools QUIET) #REQUIRED # PySide2 utilities (pyside2-uic & pyside2-rcc) if(NOT PYSIDE2_TOOLS_FOUND)