link against TKAdvTools only if OCCT < 6.7.3
This commit is contained in:
parent
fcb2714d0d
commit
1f162dec2d
|
@ -362,6 +362,7 @@ if(FREECAD_LIBPACK_USE)
|
|||
|
||||
else(FREECAD_LIBPACK_USE)
|
||||
|
||||
include(cMake/FreeCadMacros.cmake)
|
||||
|
||||
# ================================================================================
|
||||
# == for other OSes search the packages ==========================================
|
||||
|
@ -455,8 +456,14 @@ else(FREECAD_LIBPACK_USE)
|
|||
TKXDESTEP
|
||||
TKXDEIGES
|
||||
TKMeshVS
|
||||
TKAdvTools
|
||||
)
|
||||
CHECK_MINIMUM_OCC_VERSION_HEX(0x060703)
|
||||
if (NOT OCC_MIN_VERSION)
|
||||
set(OCC_OCAF_LIBRARIES
|
||||
${OCC_OCAF_LIBRARIES}
|
||||
TKAdvTools
|
||||
)
|
||||
endif()
|
||||
set(OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS})
|
||||
set(OCC_FOUND ${OCE_FOUND})
|
||||
else() #look for OpenCASCADE
|
||||
|
@ -637,7 +644,6 @@ if(WIN32)
|
|||
endif(WIN32)
|
||||
|
||||
|
||||
include(cMake/FreeCadMacros.cmake)
|
||||
|
||||
|
||||
# ================================================================================
|
||||
|
|
|
@ -89,7 +89,14 @@ IF(OCC_LIBRARY)
|
|||
TKXDESTEP
|
||||
TKXDEIGES
|
||||
TKMeshVS
|
||||
TKAdvTools
|
||||
)
|
||||
CHECK_MINIMUM_OCC_VERSION_HEX(0x060703)
|
||||
if (NOT OCC_MIN_VERSION)
|
||||
set(OCC_OCAF_LIBRARIES
|
||||
${OCC_OCAF_LIBRARIES}
|
||||
TKAdvTools
|
||||
)
|
||||
endif()
|
||||
|
||||
ENDIF(OCC_LIBRARY)
|
||||
|
||||
|
|
2
src/3rdParty/salomesmesh/Makefile.am
vendored
2
src/3rdParty/salomesmesh/Makefile.am
vendored
|
@ -21,7 +21,7 @@ endif
|
|||
#AM_LDFLAGS = -version-info 1:0:0 -Wl,--no-undefined -L$(OCC_LIB)
|
||||
AM_LDFLAGS = -version-info 1:0:0 -L$(OCC_LIB) \
|
||||
-lTKernel -lTKService -lTKMath -lTKBRep -lTKTopAlgo -lTKGeomAlgo \
|
||||
-lTKGeomBase -lTKG3d -lTKG2d -lTKMeshVS -lTKShHealing -lTKPrim -lTKAdvTools
|
||||
-lTKGeomBase -lTKG3d -lTKG2d -lTKMeshVS -lTKShHealing -lTKPrim
|
||||
|
||||
#uninstall-local:
|
||||
# -rm -rf $(DESTDIR)$(libdir)
|
||||
|
|
Loading…
Reference in New Issue
Block a user