suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ add '_' as prefix for PartDesign module to fix name clash

Browse Source
This commit is contained in:
wmayer 2014-05-10 14:12:25 +02:00
parent 6b89c03181
commit 068452f0ac
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/PartDesign/App/AppPartDesign.cpp
View File

@ -58,7 +58,7 @@ PyDoc_STRVAR(module_PartDesign_doc,
/* Python entry */
extern "C" {
void PartDesignExport initPartDesign()
void PartDesignExport init_PartDesign()
{
// load dependent module
try {
@ -69,7 +69,7 @@ void PartDesignExport initPartDesign()
PyErr_SetString(PyExc_ImportError, e.what());
return;
}
Py_InitModule3("PartDesign", PartDesign_methods, module_PartDesign_doc); /* mod name, table ptr */
Py_InitModule3("_PartDesign", PartDesign_methods, module_PartDesign_doc); /* mod name, table ptr */
Base::Console().Log("Loading PartDesign module... done\n");

2
src/Mod/PartDesign/App/CMakeLists.txt
View File

@ -128,7 +128,7 @@ fc_target_copy_resource(PartDesign
${CMAKE_BINARY_DIR}/Mod/PartDesign
${PartDesign_Scripts})
SET_BIN_DIR(PartDesign PartDesign /Mod/PartDesign)
SET_BIN_DIR(PartDesign _PartDesign /Mod/PartDesign)
SET_PYTHON_PREFIX_SUFFIX(PartDesign)
INSTALL(TARGETS PartDesign DESTINATION ${CMAKE_INSTALL_LIBDIR})

5
src/Mod/PartDesign/__init__.py
View File

@ -1,2 +1,3 @@
import Scripts.FilletArc
makeFilletArc = Scripts.FilletArc.makeFilletArc
import _PartDesign
makeFilletArc = _PartDesign.makeFilletArc