From c64ca7b78fdd8a8b4fd50619ee227bb0caec5a1b Mon Sep 17 00:00:00 2001 From: wwmayer Date: Fri, 9 Dec 2022 23:38:59 +0100 Subject: [PATCH] Revert "[PD] App: precompiled header fixes" --- src/Mod/PartDesign/App/AppPartDesign.cpp | 2 +- src/Mod/PartDesign/App/AppPartDesignPy.cpp | 2 +- src/Mod/PartDesign/App/CMakeLists.txt | 14 +++++++------- src/Mod/PartDesign/App/PreCompiled.cpp | 1 + src/Mod/PartDesign/__init__.py | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Mod/PartDesign/App/AppPartDesign.cpp b/src/Mod/PartDesign/App/AppPartDesign.cpp index 3ced52cdb8..87ed33c03b 100644 --- a/src/Mod/PartDesign/App/AppPartDesign.cpp +++ b/src/Mod/PartDesign/App/AppPartDesign.cpp @@ -63,7 +63,7 @@ extern PyObject* initModule(); } /* Python entry */ -PyMOD_INIT_FUNC(PartDesign) +PyMOD_INIT_FUNC(_PartDesign) { // load dependent module try { diff --git a/src/Mod/PartDesign/App/AppPartDesignPy.cpp b/src/Mod/PartDesign/App/AppPartDesignPy.cpp index 68b1d059cc..a9473d999e 100644 --- a/src/Mod/PartDesign/App/AppPartDesignPy.cpp +++ b/src/Mod/PartDesign/App/AppPartDesignPy.cpp @@ -32,7 +32,7 @@ namespace PartDesign { class Module : public Py::ExtensionModule { public: - Module() : Py::ExtensionModule("PartDesign") + Module() : Py::ExtensionModule("_PartDesign") { add_varargs_method("makeFilletArc",&Module::makeFilletArc, "makeFilletArc(...) -- Fillet arc." diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index 278a57e3c5..d74a77c1d5 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -144,16 +144,16 @@ SET(PartDesign_SRCS ${Python_SRCS} ) -if(FREECAD_USE_PCH) - add_definitions(-D_PreComp_) - GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${PartDesign_SRCS}) - ADD_MSVC_PRECOMPILED_HEADER(PartDesign PreCompiled.h PreCompiled.cpp PCH_SRCS) -endif(FREECAD_USE_PCH) - add_library(PartDesign SHARED ${PartDesign_SRCS}) target_link_libraries(PartDesign ${PartDesign_LIBS}) -SET_BIN_DIR(PartDesign PartDesign /Mod/PartDesign) +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PartDesign_CPP_SRCS ${PartDesign_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(PartDesign PreCompiled.h PreCompiled.cpp PartDesign_CPP_SRCS) +endif(FREECAD_USE_PCH) + +SET_BIN_DIR(PartDesign _PartDesign /Mod/PartDesign) SET_PYTHON_PREFIX_SUFFIX(PartDesign) INSTALL(TARGETS PartDesign DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/Mod/PartDesign/App/PreCompiled.cpp b/src/Mod/PartDesign/App/PreCompiled.cpp index cde4369c5b..7cd1cae80f 100644 --- a/src/Mod/PartDesign/App/PreCompiled.cpp +++ b/src/Mod/PartDesign/App/PreCompiled.cpp @@ -20,4 +20,5 @@ * * ***************************************************************************/ + #include "PreCompiled.h" diff --git a/src/Mod/PartDesign/__init__.py b/src/Mod/PartDesign/__init__.py index 20855033ff..29a70ae509 100644 --- a/src/Mod/PartDesign/__init__.py +++ b/src/Mod/PartDesign/__init__.py @@ -1,3 +1,3 @@ -import PartDesign -makeFilletArc = PartDesign.makeFilletArc - +import _PartDesign +makeFilletArc = _PartDesign.makeFilletArc +