kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

CMake: [skip ci] add build option to let the user decide to link with shiboken/PySide at build time

Browse Source
This commit is contained in:
wmayer
2020-06-10 10:18:47 +02:00
parent f80a78cf64
commit 5ffb62d8c5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
View File

@@ -136,4 +136,11 @@ macro(SetupShibokenAndPyside)
find_package(PySideTools REQUIRED) # PySide utilities (pyside-uic & pyside-rcc)
endif(BUILD_QT5)
# If shiboken cannot be found the build option will be set to OFF
if(NOT SHIBOKEN_INCLUDE_DIR)
option(FREECAD_USE_SHIBOKEN "Links to the shiboken and PySide libraries at build time. If OFF their Python modules are imported at runtime" OFF)
else()
option(FREECAD_USE_SHIBOKEN "Links to the shiboken and PySide libraries at build time. If OFF their Python modules are imported at runtime" ON)
endif(NOT SHIBOKEN_INCLUDE_DIR)
endmacro(SetupShibokenAndPyside)

4
src/Gui/CMakeLists.txt
View File

@@ -171,7 +171,7 @@ IF(OCULUS_FOUND)
)
ENDIF(OCULUS_FOUND)
if(SHIBOKEN_INCLUDE_DIR)
if(FREECAD_USE_SHIBOKEN)
if (BUILD_QT5)
add_definitions(-DHAVE_SHIBOKEN2)
else()
@@ -191,7 +191,7 @@ if(SHIBOKEN_INCLUDE_DIR)
)
endif (TARGET Shiboken2::libshiboken)
endif (SHIBOKEN_LIBRARY)
endif(SHIBOKEN_INCLUDE_DIR)
endif(FREECAD_USE_SHIBOKEN)
if(PYSIDE_INCLUDE_DIR)
include_directories(