diff --git a/CMakeLists.txt b/CMakeLists.txt index c5ed653fb..70f369132 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,7 +220,7 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X) message("-- OpenCASCADE Community Edition has been found.") add_definitions ( -DHAVE_CONFIG_H ) set( OCC_LIBRARIES "TKFeat;TKFillet;TKMesh;TKernel;TKG2d;TKG3d;TKMath;TKIGES;TKSTL;TKShHealing;TKXSBase;TKBool;TKBO;TKBRep;TKTopAlgo;TKGeomAlgo;TKGeomBase;TKOffset;TKPrim;TKSTEP;TKSTEPBase;TKSTEPAttr;TKHLR" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake - set( OCC_OCAF_LIBRARIES "TKCAF;TKXCAF;TKLCAF;TKXDESTEP;TKXDEIGES" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake + set( OCC_OCAF_LIBRARIES "TKCAF;TKXCAF;TKLCAF;TKXDESTEP;TKXDEIGES;TKMeshVS;TKAdvTools" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake set( OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS} ) set( OCC_FOUND ${OCE_FOUND} ) else() #look for OpenCASCADE diff --git a/README.MinGW b/README.MinGW index 2248fbd06..0b902d7e4 100644 --- a/README.MinGW +++ b/README.MinGW @@ -270,6 +270,23 @@ Note: For a couple of libraries the arguments passed to the linker exceeds the n g++ -shared -o libTKGeomAlgo.dll *.obj rm -f *.obj +o Netgen +Modify the following files: +* libsrc/meshing/improve2.hpp + Add DLL_HEADER to class MeshOptimize2d +* libsrc/meshing/meshclass.hpp + Add DLL_HEADER to CalcSurfacesOfNode +* libsrc/meshing/meshtype.hpp + Add DLL_HEADER to classes SurfaceElementIndex, MeshPoint, Element2d (int anp), +* libsrc/occ/occgeom.hpp + Add DLL_HEADER to classes Line, OCCGeometry, OCCParameters, OCCGenerateMesh +* libsrc/occ/occmeshsurf.hpp + Add DLL_HEADER to classes OCCSurface, Meshing2OCCSurfaces, MeshOptimize2dOCCSurfaces, OCCRefinementSurfaces + +Run the configure script with these arguments + ./configure --prefix=/usr/local --enable-shared --enable-occ --with-occ=/usr/local --with-tcl=/usr/local/lib --enable-nglib CXXFLAGS="-DNGLIB_EXPORTS -DWNT" + make && make install + Building the FreeCAD sources ---------------------------- diff --git a/cMake/FindOpenCasCade.cmake b/cMake/FindOpenCasCade.cmake index 2c97af1d3..04e7dce8e 100644 --- a/cMake/FindOpenCasCade.cmake +++ b/cMake/FindOpenCasCade.cmake @@ -88,6 +88,8 @@ IF(OCC_LIBRARY) TKLCAF TKXDESTEP TKXDEIGES + TKMeshVS + TKAdvTools ) ENDIF(OCC_LIBRARY) diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake index 0008e3fe5..4def5d1f7 100644 --- a/cMake/UseLibPack8x.cmake +++ b/cMake/UseLibPack8x.cmake @@ -345,6 +345,8 @@ set(OCC_OCAF_LIBRARIES optimized TKLCAF optimized TKXDESTEP optimized TKXDEIGES + optimized TKMeshVS + optimized TKAdvTools ) set(OCC_DEBUG_LIBRARIES debug TKFilletd @@ -378,6 +380,8 @@ set(OCC_OCAF_DEBUG_LIBRARIES debug TKLCAFd debug TKXDESTEPd debug TKXDEIGESd + debug TKMeshVSd + debug TKAdvToolsd ) set(OCC_FOUND TRUE) diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake index e9e6c36ac..740291a02 100644 --- a/cMake/UseLibPackCustom.cmake +++ b/cMake/UseLibPackCustom.cmake @@ -385,6 +385,8 @@ set(OCC_OCAF_LIBRARIES TKLCAF TKXDESTEP TKXDEIGES + TKMeshVS + TKAdvTools ) set(OCC_FOUND TRUE) diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt index b381d7577..2808c6d38 100644 --- a/src/3rdParty/salomesmesh/CMakeLists.txt +++ b/src/3rdParty/salomesmesh/CMakeLists.txt @@ -32,23 +32,17 @@ if(MSVC) optimized MSVCRT.LIB optimized MSVCPRT.LIB Rpcrt4.lib - ${NGLIB_LIBRARIES} - ${NGLIB_DEBUG_LIBRARIES} - ${OCC_LIBRARIES} - ${OCC_DEBUG_LIBRARIES} - ${OCC_OCAF_DEBUG_LIBRARIES} - ${OCC_OCAF_LIBRARIES} - optimized TKMeshVS.lib - debug TKMeshVSd.lib - optimized TKAdvTools.lib - debug TKAdvToolsd.lib - ) + ${NGLIB_LIBRARIES} + ${NGLIB_DEBUG_LIBRARIES} + ${OCC_LIBRARIES} + ${OCC_DEBUG_LIBRARIES} + ${OCC_OCAF_DEBUG_LIBRARIES} + ${OCC_OCAF_LIBRARIES} + ) else(MSVC) set(SMESH_LIBS ${OCC_LIBRARIES} ${OCC_OCAF_LIBRARIES} - TKMeshVS - TKAdvTools ) endif(MSVC)