philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MacOs build

Browse Source 
Avoid use empty path for custom dir
This commit is contained in:
Renato Araujo Oliveira Filho
2023-05-02 15:15:25 -03:00
committed by Sergio Martins
parent c603593552
commit c3751142c0
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/KDAB/modules/FindPySide2.cmake
View File

@@ -98,6 +98,10 @@ else()
#PySide #PySide
#=============================================================================== #===============================================================================
if(PYSIDE_CUSTOM_PREFIX STREQUAL "")
set(PYSIDE_CUSTOM_PREFIX ${PYSIDE2_BASEDIR})
endif()
find_path( find_path(
PYSIDE_INCLUDE_DIR pyside.h PYSIDE_INCLUDE_DIR pyside.h
PATHS ${PYSIDE2_BASEDIR}/include ${PYSIDE_CUSTOM_PREFIX}/include/PySide2 PATHS ${PYSIDE2_BASEDIR}/include ${PYSIDE_CUSTOM_PREFIX}/include/PySide2

6
cmake/KDAB/modules/FindShiboken2.cmake
View File

@@ -81,9 +81,13 @@ else()
list(GET SHIBOKEN_VERSION 2 SHIBOKEN_MINOR_VERSION) list(GET SHIBOKEN_VERSION 2 SHIBOKEN_MINOR_VERSION)
string(REPLACE ";" "." SHIBOKEN_VERSION "${SHIBOKEN_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 "ShibokenGenerator base dir: ${SHIBOKEN_GENERATOR_BASEDIR}")
message(STATUS "Shiboken base dir: ${SHIBOKEN_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) if(SHIBOKEN_BASEDIR)
find_path( find_path(