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

Move TKMeshVS & TKAdvTools to OCC_OCAF_LIBRARIES variable

Browse Source
This commit is contained in:
wmayer 2013-04-01 23:13:51 +02:00
parent 823a3ca3e5
commit 4dc31c4d80
6 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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

17
README.MinGW
View File

@ -270,6 +270,23 @@ Note: For a couple of libraries the arguments passed to the linker exceeds the n
g++ <options> -shared -o libTKGeomAlgo.dll *.obj <libs>
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
----------------------------

2
cMake/FindOpenCasCade.cmake
View File

@ -88,6 +88,8 @@ IF(OCC_LIBRARY)
TKLCAF
TKXDESTEP
TKXDEIGES
TKMeshVS
TKAdvTools
)
ENDIF(OCC_LIBRARY)

4
cMake/UseLibPack8x.cmake
View File

@ -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)

2
cMake/UseLibPackCustom.cmake
View File

@ -385,6 +385,8 @@ set(OCC_OCAF_LIBRARIES
TKLCAF
TKXDESTEP
TKXDEIGES
TKMeshVS
TKAdvTools
)
set(OCC_FOUND TRUE)

20
src/3rdParty/salomesmesh/CMakeLists.txt vendored
View File

@ -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)