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

Use variable OCC_OCAF_LIBRARIES for OCAF libs

Browse Source
This commit is contained in:
wmayer 2012-10-01 13:16:07 +02:00
parent c223f44a97
commit aa72516fbe
5 changed files with 70 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cMake/UseLibPack6x.cmake
View File

@ -277,6 +277,9 @@ set(ODE_FOUND TRUE)
# OCC # OCC
set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade) set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade)
set(OCC_LIBRARY_DIR
${FREECAD_LIBPACK_DIR}/lib
)
set(OCC_LIBRARIES set(OCC_LIBRARIES
TKFillet TKFillet
TKMesh TKMesh
@ -302,7 +305,11 @@ set(OCC_LIBRARIES
TKHLR TKHLR
TKFeat TKFeat
) )
set(OCC_LIBRARY_DIR set(OCC_OCAF_LIBRARIES
${FREECAD_LIBPACK_DIR}/lib TKCAF
TKXCAF
TKLCAF
TKXDESTEP
TKXDEIGES
) )
set(OCC_FOUND TRUE) set(OCC_FOUND TRUE)

11
cMake/UseLibPack7x.cmake
View File

@ -283,6 +283,9 @@ set(OPENCV_FOUND TRUE)
# OCC # OCC
set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade) set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade)
set(OCC_LIBRARY_DIR
${FREECAD_LIBPACK_DIR}/lib
)
set(OCC_LIBRARIES set(OCC_LIBRARIES
TKFillet TKFillet
TKMesh TKMesh
@ -308,8 +311,12 @@ set(OCC_LIBRARIES
TKHLR TKHLR
TKFeat TKFeat
) )
set(OCC_LIBRARY_DIR set(OCC_OCAF_LIBRARIES
${FREECAD_LIBPACK_DIR}/lib TKCAF
TKXCAF
TKLCAF
TKXDESTEP
TKXDEIGES
) )
set(OCC_FOUND TRUE) set(OCC_FOUND TRUE)

20
cMake/UseLibPack8x.cmake
View File

@ -283,6 +283,9 @@ set(OPENCV_FOUND TRUE)
# OCC # OCC
set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade) set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade)
set(OCC_LIBRARY_DIR
${FREECAD_LIBPACK_DIR}/lib
)
set(OCC_LIBRARIES set(OCC_LIBRARIES
TKFillet TKFillet
TKMesh TKMesh
@ -295,14 +298,7 @@ set(OCC_LIBRARIES
TKShHealing TKShHealing
TKXSBase TKXSBase
TKBool TKBool
TKXSBase TKXSBase
TKXCAF
TKLCAF
TKCAF
TKSTEP
TKIGES
TKXDESTEP
TKXDEIGES
TKBO TKBO
TKBRep TKBRep
TKTopAlgo TKTopAlgo
@ -316,8 +312,12 @@ set(OCC_LIBRARIES
TKHLR TKHLR
TKFeat TKFeat
) )
set(OCC_LIBRARY_DIR set(OCC_OCAF_LIBRARIES
${FREECAD_LIBPACK_DIR}/lib TKCAF
TKXCAF
TKLCAF
TKXDESTEP
TKXDEIGES
) )
set(OCC_FOUND TRUE) set(OCC_FOUND TRUE)

43
cMake/UseLibPackCustom.cmake
View File

@ -305,7 +305,42 @@ set(OPENCV_LIBRARIES cv.lib cvaux.lib cxcore.lib cxts.lib highgui.lib)
set(OPENCV_FOUND TRUE) set(OPENCV_FOUND TRUE)
# OCC # OCC
#set(OCC_INCLUDE_DIR C:/Projects/LibPack/oce-0.10.0/include/oce)
#set(OCC_LIBRARY_DIR C:/Projects/LibPack/oce-0.10.0/Win64/lib)
#set(OCC_LIBRARIES
# ${OCC_LIBRARY_DIR}/TKFillet.lib
# ${OCC_LIBRARY_DIR}/TKMesh.lib
# ${OCC_LIBRARY_DIR}/TKernel.lib
# ${OCC_LIBRARY_DIR}/TKG2d.lib
# ${OCC_LIBRARY_DIR}/TKG3d.lib
# ${OCC_LIBRARY_DIR}/TKMath.lib
# ${OCC_LIBRARY_DIR}/TKIGES.lib
# ${OCC_LIBRARY_DIR}/TKSTL.lib
# ${OCC_LIBRARY_DIR}/TKShHealing.lib
# ${OCC_LIBRARY_DIR}/TKXSBase.lib
# ${OCC_LIBRARY_DIR}/TKBool.lib
# ${OCC_LIBRARY_DIR}/TKBO.lib
# ${OCC_LIBRARY_DIR}/TKBRep.lib
# ${OCC_LIBRARY_DIR}/TKTopAlgo.lib
# ${OCC_LIBRARY_DIR}/TKGeomAlgo.lib
# ${OCC_LIBRARY_DIR}/TKGeomBase.lib
# ${OCC_LIBRARY_DIR}/TKOffset.lib
# ${OCC_LIBRARY_DIR}/TKPrim.lib
# ${OCC_LIBRARY_DIR}/TKSTEP.lib
# ${OCC_LIBRARY_DIR}/TKSTEPBase.lib
# ${OCC_LIBRARY_DIR}/TKSTEPAttr.lib
# ${OCC_LIBRARY_DIR}/TKHLR.lib
# ${OCC_LIBRARY_DIR}/TKFeat.lib
#)
#set(OCC_OCAF_LIBRARIES
# ${OCC_LIBRARY_DIR}/TKCAF.lib
# ${OCC_LIBRARY_DIR}/TKXCAF.lib
# ${OCC_LIBRARY_DIR}/TKLCAF.lib
# ${OCC_LIBRARY_DIR}/TKXDESTEP.lib
# ${OCC_LIBRARY_DIR}/TKXDEIGES.lib
#)
set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade-6.3.0) set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/OpenCascade-6.3.0)
set(OCC_LIBRARY_DIR ${FREECAD_LIBPACK_DIR}/lib)
set(OCC_LIBRARIES set(OCC_LIBRARIES
TKFillet TKFillet
TKMesh TKMesh
@ -331,8 +366,12 @@ set(OCC_LIBRARIES
TKHLR TKHLR
TKFeat TKFeat
) )
set(OCC_LIBRARY_DIR set(OCC_OCAF_LIBRARIES
${FREECAD_LIBPACK_DIR}/lib TKCAF
TKXCAF
TKLCAF
TKXDESTEP
TKXDEIGES
) )
set(OCC_FOUND TRUE) set(OCC_FOUND TRUE)

6
src/Mod/Import/Gui/CMakeLists.txt
View File

@ -22,11 +22,7 @@ link_directories(${OCC_LIBRARY_DIR})
set(ImportGui_LIBS set(ImportGui_LIBS
FreeCADGui FreeCADGui
PartGui PartGui
TKCAF ${OCC_OCAF_LIBRARIES}
TKXCAF
TKLCAF
TKXDESTEP
TKXDEIGES
) )
SET(ImportGui_SRCS SET(ImportGui_SRCS