From 4032a88c2d2d607a5d7d003efdc9ed85121640e6 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 1 Aug 2014 15:07:27 +0200 Subject: [PATCH] Revert "remove TKAdvTools" This reverts commit 6843d6ad5dc875ad0599993ac35c1852d1c97a90. --- CMakeLists.txt | 1 + cMake/FindOpenCasCade.cmake | 1 + src/3rdParty/salomesmesh/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffbeef46a..ca6a5c1a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -455,6 +455,7 @@ else(FREECAD_LIBPACK_USE) TKXDESTEP TKXDEIGES TKMeshVS + TKAdvTools ) set(OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS}) set(OCC_FOUND ${OCE_FOUND}) diff --git a/cMake/FindOpenCasCade.cmake b/cMake/FindOpenCasCade.cmake index f10947775..04e7dce8e 100644 --- a/cMake/FindOpenCasCade.cmake +++ b/cMake/FindOpenCasCade.cmake @@ -89,6 +89,7 @@ IF(OCC_LIBRARY) TKXDESTEP TKXDEIGES TKMeshVS + TKAdvTools ) ENDIF(OCC_LIBRARY) diff --git a/src/3rdParty/salomesmesh/Makefile.am b/src/3rdParty/salomesmesh/Makefile.am index 97752e485..0c1d394ec 100644 --- a/src/3rdParty/salomesmesh/Makefile.am +++ b/src/3rdParty/salomesmesh/Makefile.am @@ -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 + -lTKGeomBase -lTKG3d -lTKG2d -lTKMeshVS -lTKShHealing -lTKPrim -lTKAdvTools #uninstall-local: # -rm -rf $(DESTDIR)$(libdir)