From bf5baa5de444cb82368adf75ecedfb109ffdeebd Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 15 Nov 2024 18:58:17 +0100 Subject: [PATCH] CMake: Remove FREECAD_USE_PYBIND11 as a build option --- cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake | 4 ++++ cMake/FreeCAD_Helpers/PrintFinalReport.cmake | 1 - cMake/FreeCAD_Helpers/SetupPybind11.cmake | 1 - src/Mod/MeshPart/App/CMakeLists.txt | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake index 6e8c8e42b0..bbe168eeed 100644 --- a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake +++ b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake @@ -201,6 +201,10 @@ macro(InitializeFreeCADBuildOptions) set(BUILD_SMESH OFF) endif() + if (BUILD_CAM OR BUILD_FLAT_MESH) + set(FREECAD_USE_PYBIND11 ON) + endif() + # force build directory to be different to source directory if (BUILD_FORCE_DIRECTORY) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake index 14cf57bd89..25bb8e7b3a 100644 --- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake +++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake @@ -87,7 +87,6 @@ macro(PrintFinalReport) value(Python3_EXECUTABLE) value(PYTHON_LIBRARY) value(FREECAD_CREATE_MAC_APP) - value(FREECAD_USE_PYBIND11) value(FREECAD_USE_EXTERNAL_KDL) value(FREECAD_USE_PYSIDE) value(FREECAD_USE_SHIBOKEN) diff --git a/cMake/FreeCAD_Helpers/SetupPybind11.cmake b/cMake/FreeCAD_Helpers/SetupPybind11.cmake index 7fc65dfe86..7c8a9880ec 100644 --- a/cMake/FreeCAD_Helpers/SetupPybind11.cmake +++ b/cMake/FreeCAD_Helpers/SetupPybind11.cmake @@ -2,7 +2,6 @@ macro(SetupPybind11) # -------------------------------- PyBind11 ----------------------------- # necessary for flat-mesh feature - option(FREECAD_USE_PYBIND11 "Use pybind11" OFF) if (FREECAD_USE_PYBIND11) find_package(pybind11 REQUIRED) endif() diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt index 92179592a3..3d1d34da7f 100644 --- a/src/Mod/MeshPart/App/CMakeLists.txt +++ b/src/Mod/MeshPart/App/CMakeLists.txt @@ -99,7 +99,7 @@ INSTALL(TARGETS MeshPart DESTINATION ${CMAKE_INSTALL_LIBDIR}) ################################ flat mesh ############################### -if (BUILD_FLAT_MESH AND FREECAD_USE_PYBIND11) +if (BUILD_FLAT_MESH) SET(FLATMESH_SRCS MeshFlattening.cpp MeshFlattening.h @@ -117,5 +117,5 @@ if (BUILD_FLAT_MESH AND FREECAD_USE_PYBIND11) SET_BIN_DIR(flatmesh flatmesh /Mod/MeshPart) install(TARGETS flatmesh DESTINATION ${CMAKE_INSTALL_LIBDIR}) -endif(BUILD_FLAT_MESH AND FREECAD_USE_PYBIND11) +endif(BUILD_FLAT_MESH) ############################################################################