From 15076cb504de6ff2bd2267d57aa3b263eabf313b Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Sun, 16 Feb 2025 17:37:13 +0000 Subject: [PATCH] Core: Move `PyCXX` library to `src/3rdParty`. --- cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake | 4 ++-- src/{ => 3rdParty/PyCXX}/CXX/COPYRIGHT | 0 src/{ => 3rdParty/PyCXX}/CXX/Config.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/CxxDebug.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Exception.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Extensions.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/IndirectPythonInterface.cxx | 0 src/{ => 3rdParty/PyCXX}/CXX/IndirectPythonInterface.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Objects.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/Config.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/CxxDebug.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/Exception.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/ExtensionModule.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/ExtensionOldType.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/ExtensionType.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/ExtensionTypeBase.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/Extensions.hxx | 0 .../PyCXX}/CXX/Python2/IndirectPythonInterface.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/Objects.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/PythonType.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/cxx_extensions.cxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/cxxextensions.c | 0 src/{ => 3rdParty/PyCXX}/CXX/Python2/cxxsupport.cxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/Config.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/CxxDebug.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/Exception.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/ExtensionModule.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/ExtensionOldType.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/ExtensionType.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/ExtensionTypeBase.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/Extensions.hxx | 0 .../PyCXX}/CXX/Python3/IndirectPythonInterface.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/Objects.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/PythonType.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/cxx_exceptions.cxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/cxx_extensions.cxx | 0 .../PyCXX}/CXX/Python3/cxx_standard_exceptions.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/cxxextensions.c | 0 src/{ => 3rdParty/PyCXX}/CXX/Python3/cxxsupport.cxx | 0 src/{ => 3rdParty/PyCXX}/CXX/Version.hxx | 0 src/{ => 3rdParty/PyCXX}/CXX/WrapPython.h | 0 src/{ => 3rdParty/PyCXX}/CXX/cxx_exceptions.cxx | 0 src/{ => 3rdParty/PyCXX}/CXX/cxx_extensions.cxx | 0 src/{ => 3rdParty/PyCXX}/CXX/cxxextensions.c | 0 src/{ => 3rdParty/PyCXX}/CXX/cxxsupport.cxx | 0 src/{ => 3rdParty/PyCXX}/CXX/pycxx.dox | 0 src/App/CMakeLists.txt | 1 + src/Base/CMakeLists.txt | 1 + src/Gui/CMakeLists.txt | 1 + src/Main/CMakeLists.txt | 2 ++ src/Mod/Assembly/App/CMakeLists.txt | 1 + src/Mod/Assembly/Gui/CMakeLists.txt | 1 + src/Mod/CAM/App/CMakeLists.txt | 1 + src/Mod/CAM/Gui/CMakeLists.txt | 1 + src/Mod/CAM/PathSimulator/App/CMakeLists.txt | 1 + src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt | 1 + src/Mod/CAM/libarea/CMakeLists.txt | 1 + src/Mod/Cloud/App/CMakeLists.txt | 1 + src/Mod/Cloud/Gui/CMakeLists.txt | 1 + src/Mod/Draft/App/CMakeLists.txt | 1 + src/Mod/Drawing/App/CMakeLists.txt | 1 + src/Mod/Drawing/Gui/CMakeLists.txt | 1 + src/Mod/Fem/App/CMakeLists.txt | 1 + src/Mod/Fem/Gui/CMakeLists.txt | 1 + src/Mod/Import/App/CMakeLists.txt | 1 + src/Mod/Import/Gui/CMakeLists.txt | 1 + src/Mod/Inspection/App/CMakeLists.txt | 1 + src/Mod/Inspection/Gui/CMakeLists.txt | 1 + src/Mod/JtReader/App/CMakeLists.txt | 1 + src/Mod/Material/App/CMakeLists.txt | 1 + src/Mod/Material/Gui/CMakeLists.txt | 1 + src/Mod/Measure/App/CMakeLists.txt | 1 + src/Mod/Measure/Gui/CMakeLists.txt | 1 + src/Mod/Mesh/App/CMakeLists.txt | 1 + src/Mod/Mesh/Gui/CMakeLists.txt | 1 + src/Mod/MeshPart/App/CMakeLists.txt | 1 + src/Mod/MeshPart/Gui/CMakeLists.txt | 1 + src/Mod/Part/App/CMakeLists.txt | 1 + src/Mod/Part/Gui/CMakeLists.txt | 1 + src/Mod/PartDesign/App/CMakeLists.txt | 1 + src/Mod/PartDesign/Gui/CMakeLists.txt | 1 + src/Mod/Points/App/CMakeLists.txt | 1 + src/Mod/Points/Gui/CMakeLists.txt | 1 + src/Mod/ReverseEngineering/App/CMakeLists.txt | 1 + src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 1 + src/Mod/Robot/App/CMakeLists.txt | 1 + src/Mod/Robot/Gui/CMakeLists.txt | 1 + src/Mod/Sandbox/App/CMakeLists.txt | 1 + src/Mod/Sandbox/Gui/CMakeLists.txt | 1 + src/Mod/Sketcher/App/CMakeLists.txt | 1 + src/Mod/Sketcher/Gui/CMakeLists.txt | 1 + src/Mod/Spreadsheet/App/CMakeLists.txt | 1 + src/Mod/Spreadsheet/Gui/CMakeLists.txt | 1 + src/Mod/Start/App/CMakeLists.txt | 1 + src/Mod/Start/Gui/CMakeLists.txt | 1 + src/Mod/Surface/App/CMakeLists.txt | 1 + src/Mod/Surface/Gui/CMakeLists.txt | 1 + src/Mod/TechDraw/App/CMakeLists.txt | 1 + src/Mod/TechDraw/Gui/CMakeLists.txt | 1 + src/Mod/Test/Gui/CMakeLists.txt | 1 + src/Mod/Web/App/CMakeLists.txt | 1 + src/Tools/_TEMPLATE_/App/CMakeLists.txt | 1 + src/Tools/_TEMPLATE_/Gui/CMakeLists.txt | 1 + src/Tools/embedded/Qt/cxx/CMakeLists.txt | 1 + tests/CMakeLists.txt | 2 ++ tests/src/Mod/Assembly/CMakeLists.txt | 1 + tests/src/Mod/Material/CMakeLists.txt | 1 + tests/src/Mod/Measure/CMakeLists.txt | 1 + tests/src/Mod/Mesh/CMakeLists.txt | 1 + tests/src/Mod/MeshPart/CMakeLists.txt | 1 + tests/src/Mod/Part/CMakeLists.txt | 1 + tests/src/Mod/PartDesign/CMakeLists.txt | 1 + tests/src/Mod/Points/CMakeLists.txt | 1 + tests/src/Mod/Sketcher/CMakeLists.txt | 1 + tests/src/Mod/Spreadsheet/CMakeLists.txt | 1 + 115 files changed, 73 insertions(+), 2 deletions(-) rename src/{ => 3rdParty/PyCXX}/CXX/COPYRIGHT (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Config.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/CxxDebug.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Exception.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Extensions.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/IndirectPythonInterface.cxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/IndirectPythonInterface.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Objects.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/Config.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/CxxDebug.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/Exception.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/ExtensionModule.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/ExtensionOldType.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/ExtensionType.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/ExtensionTypeBase.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/Extensions.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/IndirectPythonInterface.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/Objects.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/PythonType.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/cxx_extensions.cxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/cxxextensions.c (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python2/cxxsupport.cxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/Config.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/CxxDebug.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/Exception.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/ExtensionModule.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/ExtensionOldType.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/ExtensionType.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/ExtensionTypeBase.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/Extensions.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/IndirectPythonInterface.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/Objects.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/PythonType.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/cxx_exceptions.cxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/cxx_extensions.cxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/cxx_standard_exceptions.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/cxxextensions.c (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Python3/cxxsupport.cxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/Version.hxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/WrapPython.h (100%) rename src/{ => 3rdParty/PyCXX}/CXX/cxx_exceptions.cxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/cxx_extensions.cxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/cxxextensions.c (100%) rename src/{ => 3rdParty/PyCXX}/CXX/cxxsupport.cxx (100%) rename src/{ => 3rdParty/PyCXX}/CXX/pycxx.dox (100%) diff --git a/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake b/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake index fb760fc2fe..b7f0aa2e80 100644 --- a/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake +++ b/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake @@ -16,10 +16,10 @@ macro(ConfigureCMakeVariables) endif() set(PYCXX_INCLUDE_DIR - "${CMAKE_SOURCE_DIR}/src" CACHE PATH + "${CMAKE_SOURCE_DIR}/src/3rdParty/PyCXX" CACHE PATH "Path to the directory containing PyCXX's CXX/Config.hxx include file") set(PYCXX_SOURCE_DIR - "${CMAKE_SOURCE_DIR}/src/CXX" CACHE PATH + "${CMAKE_SOURCE_DIR}/src/3rdParty/PyCXX/CXX" CACHE PATH "Path to the directory containing PyCXX's cxxextensions.c source file") # used as compiler defines diff --git a/src/CXX/COPYRIGHT b/src/3rdParty/PyCXX/CXX/COPYRIGHT similarity index 100% rename from src/CXX/COPYRIGHT rename to src/3rdParty/PyCXX/CXX/COPYRIGHT diff --git a/src/CXX/Config.hxx b/src/3rdParty/PyCXX/CXX/Config.hxx similarity index 100% rename from src/CXX/Config.hxx rename to src/3rdParty/PyCXX/CXX/Config.hxx diff --git a/src/CXX/CxxDebug.hxx b/src/3rdParty/PyCXX/CXX/CxxDebug.hxx similarity index 100% rename from src/CXX/CxxDebug.hxx rename to src/3rdParty/PyCXX/CXX/CxxDebug.hxx diff --git a/src/CXX/Exception.hxx b/src/3rdParty/PyCXX/CXX/Exception.hxx similarity index 100% rename from src/CXX/Exception.hxx rename to src/3rdParty/PyCXX/CXX/Exception.hxx diff --git a/src/CXX/Extensions.hxx b/src/3rdParty/PyCXX/CXX/Extensions.hxx similarity index 100% rename from src/CXX/Extensions.hxx rename to src/3rdParty/PyCXX/CXX/Extensions.hxx diff --git a/src/CXX/IndirectPythonInterface.cxx b/src/3rdParty/PyCXX/CXX/IndirectPythonInterface.cxx similarity index 100% rename from src/CXX/IndirectPythonInterface.cxx rename to src/3rdParty/PyCXX/CXX/IndirectPythonInterface.cxx diff --git a/src/CXX/IndirectPythonInterface.hxx b/src/3rdParty/PyCXX/CXX/IndirectPythonInterface.hxx similarity index 100% rename from src/CXX/IndirectPythonInterface.hxx rename to src/3rdParty/PyCXX/CXX/IndirectPythonInterface.hxx diff --git a/src/CXX/Objects.hxx b/src/3rdParty/PyCXX/CXX/Objects.hxx similarity index 100% rename from src/CXX/Objects.hxx rename to src/3rdParty/PyCXX/CXX/Objects.hxx diff --git a/src/CXX/Python2/Config.hxx b/src/3rdParty/PyCXX/CXX/Python2/Config.hxx similarity index 100% rename from src/CXX/Python2/Config.hxx rename to src/3rdParty/PyCXX/CXX/Python2/Config.hxx diff --git a/src/CXX/Python2/CxxDebug.hxx b/src/3rdParty/PyCXX/CXX/Python2/CxxDebug.hxx similarity index 100% rename from src/CXX/Python2/CxxDebug.hxx rename to src/3rdParty/PyCXX/CXX/Python2/CxxDebug.hxx diff --git a/src/CXX/Python2/Exception.hxx b/src/3rdParty/PyCXX/CXX/Python2/Exception.hxx similarity index 100% rename from src/CXX/Python2/Exception.hxx rename to src/3rdParty/PyCXX/CXX/Python2/Exception.hxx diff --git a/src/CXX/Python2/ExtensionModule.hxx b/src/3rdParty/PyCXX/CXX/Python2/ExtensionModule.hxx similarity index 100% rename from src/CXX/Python2/ExtensionModule.hxx rename to src/3rdParty/PyCXX/CXX/Python2/ExtensionModule.hxx diff --git a/src/CXX/Python2/ExtensionOldType.hxx b/src/3rdParty/PyCXX/CXX/Python2/ExtensionOldType.hxx similarity index 100% rename from src/CXX/Python2/ExtensionOldType.hxx rename to src/3rdParty/PyCXX/CXX/Python2/ExtensionOldType.hxx diff --git a/src/CXX/Python2/ExtensionType.hxx b/src/3rdParty/PyCXX/CXX/Python2/ExtensionType.hxx similarity index 100% rename from src/CXX/Python2/ExtensionType.hxx rename to src/3rdParty/PyCXX/CXX/Python2/ExtensionType.hxx diff --git a/src/CXX/Python2/ExtensionTypeBase.hxx b/src/3rdParty/PyCXX/CXX/Python2/ExtensionTypeBase.hxx similarity index 100% rename from src/CXX/Python2/ExtensionTypeBase.hxx rename to src/3rdParty/PyCXX/CXX/Python2/ExtensionTypeBase.hxx diff --git a/src/CXX/Python2/Extensions.hxx b/src/3rdParty/PyCXX/CXX/Python2/Extensions.hxx similarity index 100% rename from src/CXX/Python2/Extensions.hxx rename to src/3rdParty/PyCXX/CXX/Python2/Extensions.hxx diff --git a/src/CXX/Python2/IndirectPythonInterface.hxx b/src/3rdParty/PyCXX/CXX/Python2/IndirectPythonInterface.hxx similarity index 100% rename from src/CXX/Python2/IndirectPythonInterface.hxx rename to src/3rdParty/PyCXX/CXX/Python2/IndirectPythonInterface.hxx diff --git a/src/CXX/Python2/Objects.hxx b/src/3rdParty/PyCXX/CXX/Python2/Objects.hxx similarity index 100% rename from src/CXX/Python2/Objects.hxx rename to src/3rdParty/PyCXX/CXX/Python2/Objects.hxx diff --git a/src/CXX/Python2/PythonType.hxx b/src/3rdParty/PyCXX/CXX/Python2/PythonType.hxx similarity index 100% rename from src/CXX/Python2/PythonType.hxx rename to src/3rdParty/PyCXX/CXX/Python2/PythonType.hxx diff --git a/src/CXX/Python2/cxx_extensions.cxx b/src/3rdParty/PyCXX/CXX/Python2/cxx_extensions.cxx similarity index 100% rename from src/CXX/Python2/cxx_extensions.cxx rename to src/3rdParty/PyCXX/CXX/Python2/cxx_extensions.cxx diff --git a/src/CXX/Python2/cxxextensions.c b/src/3rdParty/PyCXX/CXX/Python2/cxxextensions.c similarity index 100% rename from src/CXX/Python2/cxxextensions.c rename to src/3rdParty/PyCXX/CXX/Python2/cxxextensions.c diff --git a/src/CXX/Python2/cxxsupport.cxx b/src/3rdParty/PyCXX/CXX/Python2/cxxsupport.cxx similarity index 100% rename from src/CXX/Python2/cxxsupport.cxx rename to src/3rdParty/PyCXX/CXX/Python2/cxxsupport.cxx diff --git a/src/CXX/Python3/Config.hxx b/src/3rdParty/PyCXX/CXX/Python3/Config.hxx similarity index 100% rename from src/CXX/Python3/Config.hxx rename to src/3rdParty/PyCXX/CXX/Python3/Config.hxx diff --git a/src/CXX/Python3/CxxDebug.hxx b/src/3rdParty/PyCXX/CXX/Python3/CxxDebug.hxx similarity index 100% rename from src/CXX/Python3/CxxDebug.hxx rename to src/3rdParty/PyCXX/CXX/Python3/CxxDebug.hxx diff --git a/src/CXX/Python3/Exception.hxx b/src/3rdParty/PyCXX/CXX/Python3/Exception.hxx similarity index 100% rename from src/CXX/Python3/Exception.hxx rename to src/3rdParty/PyCXX/CXX/Python3/Exception.hxx diff --git a/src/CXX/Python3/ExtensionModule.hxx b/src/3rdParty/PyCXX/CXX/Python3/ExtensionModule.hxx similarity index 100% rename from src/CXX/Python3/ExtensionModule.hxx rename to src/3rdParty/PyCXX/CXX/Python3/ExtensionModule.hxx diff --git a/src/CXX/Python3/ExtensionOldType.hxx b/src/3rdParty/PyCXX/CXX/Python3/ExtensionOldType.hxx similarity index 100% rename from src/CXX/Python3/ExtensionOldType.hxx rename to src/3rdParty/PyCXX/CXX/Python3/ExtensionOldType.hxx diff --git a/src/CXX/Python3/ExtensionType.hxx b/src/3rdParty/PyCXX/CXX/Python3/ExtensionType.hxx similarity index 100% rename from src/CXX/Python3/ExtensionType.hxx rename to src/3rdParty/PyCXX/CXX/Python3/ExtensionType.hxx diff --git a/src/CXX/Python3/ExtensionTypeBase.hxx b/src/3rdParty/PyCXX/CXX/Python3/ExtensionTypeBase.hxx similarity index 100% rename from src/CXX/Python3/ExtensionTypeBase.hxx rename to src/3rdParty/PyCXX/CXX/Python3/ExtensionTypeBase.hxx diff --git a/src/CXX/Python3/Extensions.hxx b/src/3rdParty/PyCXX/CXX/Python3/Extensions.hxx similarity index 100% rename from src/CXX/Python3/Extensions.hxx rename to src/3rdParty/PyCXX/CXX/Python3/Extensions.hxx diff --git a/src/CXX/Python3/IndirectPythonInterface.hxx b/src/3rdParty/PyCXX/CXX/Python3/IndirectPythonInterface.hxx similarity index 100% rename from src/CXX/Python3/IndirectPythonInterface.hxx rename to src/3rdParty/PyCXX/CXX/Python3/IndirectPythonInterface.hxx diff --git a/src/CXX/Python3/Objects.hxx b/src/3rdParty/PyCXX/CXX/Python3/Objects.hxx similarity index 100% rename from src/CXX/Python3/Objects.hxx rename to src/3rdParty/PyCXX/CXX/Python3/Objects.hxx diff --git a/src/CXX/Python3/PythonType.hxx b/src/3rdParty/PyCXX/CXX/Python3/PythonType.hxx similarity index 100% rename from src/CXX/Python3/PythonType.hxx rename to src/3rdParty/PyCXX/CXX/Python3/PythonType.hxx diff --git a/src/CXX/Python3/cxx_exceptions.cxx b/src/3rdParty/PyCXX/CXX/Python3/cxx_exceptions.cxx similarity index 100% rename from src/CXX/Python3/cxx_exceptions.cxx rename to src/3rdParty/PyCXX/CXX/Python3/cxx_exceptions.cxx diff --git a/src/CXX/Python3/cxx_extensions.cxx b/src/3rdParty/PyCXX/CXX/Python3/cxx_extensions.cxx similarity index 100% rename from src/CXX/Python3/cxx_extensions.cxx rename to src/3rdParty/PyCXX/CXX/Python3/cxx_extensions.cxx diff --git a/src/CXX/Python3/cxx_standard_exceptions.hxx b/src/3rdParty/PyCXX/CXX/Python3/cxx_standard_exceptions.hxx similarity index 100% rename from src/CXX/Python3/cxx_standard_exceptions.hxx rename to src/3rdParty/PyCXX/CXX/Python3/cxx_standard_exceptions.hxx diff --git a/src/CXX/Python3/cxxextensions.c b/src/3rdParty/PyCXX/CXX/Python3/cxxextensions.c similarity index 100% rename from src/CXX/Python3/cxxextensions.c rename to src/3rdParty/PyCXX/CXX/Python3/cxxextensions.c diff --git a/src/CXX/Python3/cxxsupport.cxx b/src/3rdParty/PyCXX/CXX/Python3/cxxsupport.cxx similarity index 100% rename from src/CXX/Python3/cxxsupport.cxx rename to src/3rdParty/PyCXX/CXX/Python3/cxxsupport.cxx diff --git a/src/CXX/Version.hxx b/src/3rdParty/PyCXX/CXX/Version.hxx similarity index 100% rename from src/CXX/Version.hxx rename to src/3rdParty/PyCXX/CXX/Version.hxx diff --git a/src/CXX/WrapPython.h b/src/3rdParty/PyCXX/CXX/WrapPython.h similarity index 100% rename from src/CXX/WrapPython.h rename to src/3rdParty/PyCXX/CXX/WrapPython.h diff --git a/src/CXX/cxx_exceptions.cxx b/src/3rdParty/PyCXX/CXX/cxx_exceptions.cxx similarity index 100% rename from src/CXX/cxx_exceptions.cxx rename to src/3rdParty/PyCXX/CXX/cxx_exceptions.cxx diff --git a/src/CXX/cxx_extensions.cxx b/src/3rdParty/PyCXX/CXX/cxx_extensions.cxx similarity index 100% rename from src/CXX/cxx_extensions.cxx rename to src/3rdParty/PyCXX/CXX/cxx_extensions.cxx diff --git a/src/CXX/cxxextensions.c b/src/3rdParty/PyCXX/CXX/cxxextensions.c similarity index 100% rename from src/CXX/cxxextensions.c rename to src/3rdParty/PyCXX/CXX/cxxextensions.c diff --git a/src/CXX/cxxsupport.cxx b/src/3rdParty/PyCXX/CXX/cxxsupport.cxx similarity index 100% rename from src/CXX/cxxsupport.cxx rename to src/3rdParty/PyCXX/CXX/cxxsupport.cxx diff --git a/src/CXX/pycxx.dox b/src/3rdParty/PyCXX/CXX/pycxx.dox similarity index 100% rename from src/CXX/pycxx.dox rename to src/3rdParty/PyCXX/CXX/pycxx.dox diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt index a99498a77b..ae8a7d1bf1 100644 --- a/src/App/CMakeLists.txt +++ b/src/App/CMakeLists.txt @@ -57,6 +57,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index fc5d0cdaf6..f318c9989d 100644 --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index d264fd83dc..eecd1620ac 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -60,6 +60,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/DAGView ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index 2d0cde630e..0661e6f1b9 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -10,6 +10,7 @@ if(BUILD_GUI) ${ZLIB_INCLUDE_DIR} ${QtWidgets_INCLUDE_DIRS} ${QT_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) @@ -18,6 +19,7 @@ else(BUILD_GUI) ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${QT_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt index 5a541c5150..7cc8a1341f 100644 --- a/src/Mod/Assembly/App/CMakeLists.txt +++ b/src/Mod/Assembly/App/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${CMAKE_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt index 83d34df8f2..07b60c77cb 100644 --- a/src/Mod/Assembly/Gui/CMakeLists.txt +++ b/src/Mod/Assembly/Gui/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${COIN3D_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/CAM/App/CMakeLists.txt b/src/Mod/CAM/App/CMakeLists.txt index 3139881bb7..97647fac0e 100644 --- a/src/Mod/CAM/App/CMakeLists.txt +++ b/src/Mod/CAM/App/CMakeLists.txt @@ -10,6 +10,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/CAM/Gui/CMakeLists.txt b/src/Mod/CAM/Gui/CMakeLists.txt index 6ac05847a2..32cb8b8f92 100644 --- a/src/Mod/CAM/Gui/CMakeLists.txt +++ b/src/Mod/CAM/Gui/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${ZLIB_INCLUDE_DIR} ${OCC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/CAM/PathSimulator/App/CMakeLists.txt b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt index a3bd66b2a3..126a3ff219 100644 --- a/src/Mod/CAM/PathSimulator/App/CMakeLists.txt +++ b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} diff --git a/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt b/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt index 927d2d282f..121b3f8740 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt +++ b/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories( ${ZLIB_INCLUDE_DIR} ${OCC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} diff --git a/src/Mod/CAM/libarea/CMakeLists.txt b/src/Mod/CAM/libarea/CMakeLists.txt index 2fe859b18e..ef7828b2d9 100644 --- a/src/Mod/CAM/libarea/CMakeLists.txt +++ b/src/Mod/CAM/libarea/CMakeLists.txt @@ -9,6 +9,7 @@ if(MSVC) endif(MSVC) include_directories( + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/Mod/Cloud/App/CMakeLists.txt b/src/Mod/Cloud/App/CMakeLists.txt index b51c5e0030..f093f88fd1 100644 --- a/src/Mod/Cloud/App/CMakeLists.txt +++ b/src/Mod/Cloud/App/CMakeLists.txt @@ -5,6 +5,7 @@ endif() include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/Cloud/Gui/CMakeLists.txt b/src/Mod/Cloud/Gui/CMakeLists.txt index 38f88e580f..c1495a4bed 100644 --- a/src/Mod/Cloud/Gui/CMakeLists.txt +++ b/src/Mod/Cloud/Gui/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ) diff --git a/src/Mod/Draft/App/CMakeLists.txt b/src/Mod/Draft/App/CMakeLists.txt index d5dacbb70d..373e31deb6 100644 --- a/src/Mod/Draft/App/CMakeLists.txt +++ b/src/Mod/Draft/App/CMakeLists.txt @@ -10,6 +10,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${QT_QTCORE_INCLUDE_DIR} diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt index 450a9a33cb..9c4a90da2b 100644 --- a/src/Mod/Drawing/App/CMakeLists.txt +++ b/src/Mod/Drawing/App/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index ea733dcaf5..b9c18d392a 100644 --- a/src/Mod/Drawing/Gui/CMakeLists.txt +++ b/src/Mod/Drawing/Gui/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 882c069c33..baa8abcc87 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -22,6 +22,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 01d44af6e6..2db0fdf104 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -21,6 +21,7 @@ include_directories( ${COIN3D_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${SMESH_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt index bd591719d8..305061094a 100644 --- a/src/Mod/Import/App/CMakeLists.txt +++ b/src/Mod/Import/App/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt index e4d9b13d2a..ceff10359e 100644 --- a/src/Mod/Import/Gui/CMakeLists.txt +++ b/src/Mod/Import/Gui/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${COIN3D_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ) diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index 04fc459823..9ead7389f3 100644 --- a/src/Mod/Inspection/App/CMakeLists.txt +++ b/src/Mod/Inspection/App/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index 1cff524ee9..22a7341e99 100644 --- a/src/Mod/Inspection/Gui/CMakeLists.txt +++ b/src/Mod/Inspection/Gui/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/JtReader/App/CMakeLists.txt b/src/Mod/JtReader/App/CMakeLists.txt index 6a0b292ba8..11ae24d8f6 100644 --- a/src/Mod/JtReader/App/CMakeLists.txt +++ b/src/Mod/JtReader/App/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ) diff --git a/src/Mod/Material/App/CMakeLists.txt b/src/Mod/Material/App/CMakeLists.txt index 79ee5facef..f4c860a4e2 100644 --- a/src/Mod/Material/App/CMakeLists.txt +++ b/src/Mod/Material/App/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/Material/Gui/CMakeLists.txt b/src/Mod/Material/Gui/CMakeLists.txt index ae83e09296..53b8f2a23f 100644 --- a/src/Mod/Material/Gui/CMakeLists.txt +++ b/src/Mod/Material/Gui/CMakeLists.txt @@ -12,6 +12,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt index c804e7cf24..b9cf00edff 100644 --- a/src/Mod/Measure/App/CMakeLists.txt +++ b/src/Mod/Measure/App/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Measure/Gui/CMakeLists.txt b/src/Mod/Measure/Gui/CMakeLists.txt index a65953c39a..e42f9ca8d6 100644 --- a/src/Mod/Measure/Gui/CMakeLists.txt +++ b/src/Mod/Measure/Gui/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index d889f63f97..49825b1e24 100644 --- a/src/Mod/Mesh/App/CMakeLists.txt +++ b/src/Mod/Mesh/App/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/3rdParty/libkdtree ${Boost_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 8d836ac8a9..15dbb22d95 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS}/Inventor/annex + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt index 5d25cadc2d..4f337de023 100644 --- a/src/Mod/MeshPart/App/CMakeLists.txt +++ b/src/Mod/MeshPart/App/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${SMESH_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt index e51c7dc524..2a05e71729 100644 --- a/src/Mod/MeshPart/Gui/CMakeLists.txt +++ b/src/Mod/MeshPart/Gui/CMakeLists.txt @@ -17,6 +17,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${COIN3D_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ) diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index 06ab730b14..0c027cf6c4 100644 --- a/src/Mod/Part/App/CMakeLists.txt +++ b/src/Mod/Part/App/CMakeLists.txt @@ -9,6 +9,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index 8b1f0433df..e878a62d51 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index 64845a2dce..af96682011 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories( ${QT_INCLUDE_DIR} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${QT_INCLUDE_DIR} diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index b77fad9488..7a77f03dfb 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${COIN3D_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} diff --git a/src/Mod/Points/App/CMakeLists.txt b/src/Mod/Points/App/CMakeLists.txt index 4c87eeb9bb..8914a44df2 100644 --- a/src/Mod/Points/App/CMakeLists.txt +++ b/src/Mod/Points/App/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt index 8903007a23..39de345442 100644 --- a/src/Mod/Points/Gui/CMakeLists.txt +++ b/src/Mod/Points/Gui/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index 229ce9b9f7..221d71d379 100644 --- a/src/Mod/ReverseEngineering/App/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt @@ -22,6 +22,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 637d53861c..b36b05a4c0 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${COIN3D_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index ebb43a40cd..6d9f49c9c4 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index d0fce64622..5858b7404f 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${ZLIB_INCLUDE_DIR} ${OCC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Sandbox/App/CMakeLists.txt b/src/Mod/Sandbox/App/CMakeLists.txt index 6f6438f3f6..af660d7b5b 100644 --- a/src/Mod/Sandbox/App/CMakeLists.txt +++ b/src/Mod/Sandbox/App/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt index 6a5a56e4e2..1d8c8c6901 100644 --- a/src/Mod/Sandbox/Gui/CMakeLists.txt +++ b/src/Mod/Sandbox/Gui/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt index 3eec59b1fe..07581f3767 100644 --- a/src/Mod/Sketcher/App/CMakeLists.txt +++ b/src/Mod/Sketcher/App/CMakeLists.txt @@ -18,6 +18,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index 9c27982c9c..0588699a22 100644 --- a/src/Mod/Sketcher/Gui/CMakeLists.txt +++ b/src/Mod/Sketcher/Gui/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${COIN3D_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt index 1ae0be3b9f..013747e784 100644 --- a/src/Mod/Spreadsheet/App/CMakeLists.txt +++ b/src/Mod/Spreadsheet/App/CMakeLists.txt @@ -5,6 +5,7 @@ endif(WIN32) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt index 756691883e..595ce0c8d4 100644 --- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt +++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${COIN3D_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt index ad27072f24..93600938a9 100644 --- a/src/Mod/Start/App/CMakeLists.txt +++ b/src/Mod/Start/App/CMakeLists.txt @@ -22,6 +22,7 @@ # ***************************************************************************/ include_directories( + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${QtCore_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index 9ebf93cbf5..5d3447b284 100644 --- a/src/Mod/Start/Gui/CMakeLists.txt +++ b/src/Mod/Start/Gui/CMakeLists.txt @@ -25,6 +25,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${QtCore_INCLUDE_DIRS} ${QtSvg_INCLUDE_DIRS} diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt index 1fdb81631a..9fcade5f03 100644 --- a/src/Mod/Surface/App/CMakeLists.txt +++ b/src/Mod/Surface/App/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} diff --git a/src/Mod/Surface/Gui/CMakeLists.txt b/src/Mod/Surface/Gui/CMakeLists.txt index fc26cf7c1b..635e54a4e3 100644 --- a/src/Mod/Surface/Gui/CMakeLists.txt +++ b/src/Mod/Surface/Gui/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index c6a356cd2b..e4aaa5c823 100644 --- a/src/Mod/TechDraw/App/CMakeLists.txt +++ b/src/Mod/TechDraw/App/CMakeLists.txt @@ -9,6 +9,7 @@ include_directories( ${OCC_INCLUDE_DIR} ${ZIPIOS_INCLUDES} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index c82ea44df3..25b9dc116c 100644 --- a/src/Mod/TechDraw/Gui/CMakeLists.txt +++ b/src/Mod/TechDraw/Gui/CMakeLists.txt @@ -18,6 +18,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} ${ZIPIOS_INCLUDES} diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt index e6321f5f7c..70e5d57181 100644 --- a/src/Mod/Test/Gui/CMakeLists.txt +++ b/src/Mod/Test/Gui/CMakeLists.txt @@ -2,6 +2,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt index f2d5ee9a69..33aa54b8de 100644 --- a/src/Mod/Web/App/CMakeLists.txt +++ b/src/Mod/Web/App/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ) diff --git a/src/Tools/_TEMPLATE_/App/CMakeLists.txt b/src/Tools/_TEMPLATE_/App/CMakeLists.txt index 144ac470a8..2230b37637 100644 --- a/src/Tools/_TEMPLATE_/App/CMakeLists.txt +++ b/src/Tools/_TEMPLATE_/App/CMakeLists.txt @@ -2,6 +2,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${XercesC_INCLUDE_DIRS} diff --git a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt index d8b101bbdc..be41ef33f0 100644 --- a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt +++ b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/src/Tools/embedded/Qt/cxx/CMakeLists.txt b/src/Tools/embedded/Qt/cxx/CMakeLists.txt index 2f383a4cb5..06455cda07 100644 --- a/src/Tools/embedded/Qt/cxx/CMakeLists.txt +++ b/src/Tools/embedded/Qt/cxx/CMakeLists.txt @@ -32,6 +32,7 @@ add_definitions(-DBOOST_ALL_DYN_LINK) include_directories( ${Boost_INCLUDE_DIRS} #${COIN3D_INCLUDE_DIRS} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ef6767c9d8..6ab8e40678 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -68,6 +68,7 @@ function(setup_qt_test) endif() target_include_directories(${_testname}_Tests_run PUBLIC + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} @@ -134,6 +135,7 @@ endif() add_subdirectory(src) target_include_directories(Tests_run PUBLIC + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/tests/src/Mod/Assembly/CMakeLists.txt b/tests/src/Mod/Assembly/CMakeLists.txt index 5b905d2e9a..e8422f1c60 100644 --- a/tests/src/Mod/Assembly/CMakeLists.txt +++ b/tests/src/Mod/Assembly/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(Assembly_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/tests/src/Mod/Material/CMakeLists.txt b/tests/src/Mod/Material/CMakeLists.txt index 93c4c5da4a..1b778ffaa5 100644 --- a/tests/src/Mod/Material/CMakeLists.txt +++ b/tests/src/Mod/Material/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(Material_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/tests/src/Mod/Measure/CMakeLists.txt b/tests/src/Mod/Measure/CMakeLists.txt index 9296e3b16e..d6ad356ded 100644 --- a/tests/src/Mod/Measure/CMakeLists.txt +++ b/tests/src/Mod/Measure/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(Measure_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/tests/src/Mod/Mesh/CMakeLists.txt b/tests/src/Mod/Mesh/CMakeLists.txt index 52c9256cf4..94d7d4ab86 100644 --- a/tests/src/Mod/Mesh/CMakeLists.txt +++ b/tests/src/Mod/Mesh/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(Mesh_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/tests/src/Mod/MeshPart/CMakeLists.txt b/tests/src/Mod/MeshPart/CMakeLists.txt index c93056b4ee..dd73d83243 100644 --- a/tests/src/Mod/MeshPart/CMakeLists.txt +++ b/tests/src/Mod/MeshPart/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(MeshPart_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${SMESH_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} diff --git a/tests/src/Mod/Part/CMakeLists.txt b/tests/src/Mod/Part/CMakeLists.txt index 57898b0e8d..d0e0ad606b 100644 --- a/tests/src/Mod/Part/CMakeLists.txt +++ b/tests/src/Mod/Part/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(Part_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/tests/src/Mod/PartDesign/CMakeLists.txt b/tests/src/Mod/PartDesign/CMakeLists.txt index a3a03880b4..ded38dbda2 100644 --- a/tests/src/Mod/PartDesign/CMakeLists.txt +++ b/tests/src/Mod/PartDesign/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(PartDesign_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/tests/src/Mod/Points/CMakeLists.txt b/tests/src/Mod/Points/CMakeLists.txt index 64e804f654..650b2afb86 100644 --- a/tests/src/Mod/Points/CMakeLists.txt +++ b/tests/src/Mod/Points/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(Points_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${ZIPIOS_INCLUDES} diff --git a/tests/src/Mod/Sketcher/CMakeLists.txt b/tests/src/Mod/Sketcher/CMakeLists.txt index bfa6bcbe96..ce025bcc90 100644 --- a/tests/src/Mod/Sketcher/CMakeLists.txt +++ b/tests/src/Mod/Sketcher/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(Sketcher_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ) diff --git a/tests/src/Mod/Spreadsheet/CMakeLists.txt b/tests/src/Mod/Spreadsheet/CMakeLists.txt index 3c19e5c372..306c5a3ee9 100644 --- a/tests/src/Mod/Spreadsheet/CMakeLists.txt +++ b/tests/src/Mod/Spreadsheet/CMakeLists.txt @@ -2,6 +2,7 @@ target_include_directories(Spreadsheet_tests_run PUBLIC ${EIGEN3_INCLUDE_DIR} ${OCC_INCLUDE_DIR} + ${PYCXX_INCLUDE_DIR} ${Python3_INCLUDE_DIRS} ${SMESH_INCLUDE_DIR} ${VTK_INCLUDE_DIRS}