* cMake: Add base support for LibPack3 Minor changes to FreeCAD source code to support compiling with Qt 6.5 on MSVC, and changes to cMake setup to support the new Libpack. * NETGENPlugin: Fix compilation with MSVC and OCCT 7.8 * Material: Switch to Wrapped_ParseTupleAndKeywords for /fpermissive- on MSVC * Base: Prevent accidental definition of MIN and MAX by MSVC * cMake: Prevent accidentally finding an old LibPack * Material: Wrap another ParseTuple call * OCCT: Modify includes for 7.8.x * Part: Change TNP code to use Wrapped_ParseTupleAndArgs * Spreadsheet: Workaround for MSVC macro pollution * Mesh: Workaround for MSVC macro pollution * Base: Remove extra MSVC flag (moved to CMake) * Tests: Fix compiling with /permissive- * FEM: Fix Qt warnings about duplicate element names * cMake: Ensure major version numbers are set * Address review comments. * cMake: Further tweaks for LibPack3 * cMake: Modify specification of compiler flags for MSVC * Main: Remove QtQuick testing code * cmake: Find Boost before SMESH (which uses it) * Fixes for LibPack2 * cMake: Another try at importinhg VTK cleanly
29 lines
1.3 KiB
CMake
29 lines
1.3 KiB
CMake
# The Qt for Python project officially recommends using pip to install Shiboken, so we expect to find Shiboken in the
|
|
# site-packages directory. FreeCAD also requires shiboken6_generator, so this find script also locates that package
|
|
# and ensures the inclusion of its include directory when using the pip finding mechanism
|
|
|
|
|
|
find_package(Shiboken6 CONFIG QUIET)
|
|
if(NOT Shiboken6_FOUND)
|
|
if(NOT Shiboken6_INCLUDE_DIR AND TARGET Shiboken6::Shiboken6)
|
|
get_property(Shiboken6_INCLUDE_DIR TARGET Shiboken6::Shiboken6 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
|
|
endif()
|
|
if(NOT Shiboken6_INCLUDE_DIR)
|
|
find_pip_package(Shiboken6)
|
|
if (Shiboken6_FOUND)
|
|
set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES} CACHE INTERNAL "")
|
|
set(SHIBOKEN_MAJOR_VERSION 6 CACHE INTERNAL 6)
|
|
set(SHIBOKEN_FOUND ON CACHE BOOL OFF)
|
|
endif()
|
|
# The include directory we actually want is part of shiboken6-generator
|
|
find_pip_package(shiboken6_generator)
|
|
if (shiboken6_generator_FOUND)
|
|
set(SHIBOKEN_INCLUDE_DIR ${shiboken6_generator_INCLUDE_DIRS} CACHE PATH "")
|
|
endif()
|
|
endif()
|
|
else()
|
|
set(SHIBOKEN_INCLUDE_DIR ${Shiboken6_INCLUDE_DIRS} CACHE PATH "")
|
|
set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES} CACHE INTERNAL "")
|
|
set(SHIBOKEN_FOUND ON CACHE BOOL OFF)
|
|
endif()
|