From c3751142c0a3807cc5c426e93c51fc41eb1551fb Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Tue, 2 May 2023 15:15:25 -0300 Subject: [PATCH] Fix MacOs build Avoid use empty path for custom dir --- cmake/KDAB/modules/FindPySide2.cmake | 4 ++++ cmake/KDAB/modules/FindShiboken2.cmake | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmake/KDAB/modules/FindPySide2.cmake b/cmake/KDAB/modules/FindPySide2.cmake index a7a809cf..fcca1f2d 100644 --- a/cmake/KDAB/modules/FindPySide2.cmake +++ b/cmake/KDAB/modules/FindPySide2.cmake @@ -98,6 +98,10 @@ else() #PySide #=============================================================================== + if(PYSIDE_CUSTOM_PREFIX STREQUAL "") + set(PYSIDE_CUSTOM_PREFIX ${PYSIDE2_BASEDIR}) + endif() + find_path( PYSIDE_INCLUDE_DIR pyside.h PATHS ${PYSIDE2_BASEDIR}/include ${PYSIDE_CUSTOM_PREFIX}/include/PySide2 diff --git a/cmake/KDAB/modules/FindShiboken2.cmake b/cmake/KDAB/modules/FindShiboken2.cmake index 9f80ec66..f5664066 100644 --- a/cmake/KDAB/modules/FindShiboken2.cmake +++ b/cmake/KDAB/modules/FindShiboken2.cmake @@ -81,9 +81,13 @@ else() list(GET SHIBOKEN_VERSION 2 SHIBOKEN_MINOR_VERSION) string(REPLACE ";" "." SHIBOKEN_VERSION "${SHIBOKEN_VERSION}") + if(SHIBOKEN_CUSTOM_PREFIX STREQUAL "") + set(SHIBOKEN_CUSTOM_PREFIX ${SHIBOKEN_GENERATOR_BASEDIR}) + endif() + message(STATUS "ShibokenGenerator base dir: ${SHIBOKEN_GENERATOR_BASEDIR}") message(STATUS "Shiboken base dir: ${SHIBOKEN_BASEDIR}") - message(STATUS "Shiboken custom path: ${SHIBOKEN_CUSTOM_PREFIX}") + message(STATUS "Shiboken custom path: [${SHIBOKEN_CUSTOM_PREFIX}]") if(SHIBOKEN_BASEDIR) find_path(