From 6a52192979e3fc4fbe1c87993c26852aba7a5869 Mon Sep 17 00:00:00 2001 From: mkr Date: Fri, 11 Nov 2005 09:27:59 +0000 Subject: [PATCH] Remove uncessary libraries and dependences (for OCC6.0) from configuration files and Makefiles. --- salome_adm/unix/config_files/check_cas.m4 | 41 ++++++++++------------- salome_adm/unix/make_commence.in | 3 ++ src/CASCatch/Makefile.in | 2 +- src/HDFPersist/Makefile.in | 3 +- src/SALOMEDS/Makefile.in | 4 +-- src/SALOMEDSImpl/Makefile.in | 2 +- src/TOOLSDS/Makefile.in | 2 +- 7 files changed, 26 insertions(+), 31 deletions(-) diff --git a/salome_adm/unix/config_files/check_cas.m4 b/salome_adm/unix/config_files/check_cas.m4 index 99fd4be6b..345b13f48 100644 --- a/salome_adm/unix/config_files/check_cas.m4 +++ b/salome_adm/unix/config_files/check_cas.m4 @@ -31,9 +31,12 @@ AC_LANG_CPLUSPLUS AC_SUBST(CAS_CPPFLAGS) AC_SUBST(CAS_CXXFLAGS) AC_SUBST(CAS_KERNEL) +AC_SUBST(CAS_MATH) AC_SUBST(CAS_VIEWER) +AC_SUBST(CAS_TKTopAlgo) AC_SUBST(CAS_MODELER) AC_SUBST(CAS_OCAF) +AC_SUBST(CAS_OCAFVIS) AC_SUBST(CAS_DATAEXCHANGE) AC_SUBST(CAS_LDFLAGS) AC_SUBST(CAS_LDPATH) @@ -211,35 +214,25 @@ if test "x$occ_ok" = xno ; then AC_MSG_WARN(Opencascade libraries not found) else AC_MSG_RESULT(yes) - CAS_KERNEL="$CAS_LDPATH -lTKernel -lTKMath" + CAS_KERNEL="$CAS_LDPATH -lTKernel" + CAS_MATH="$CAS_LDPATH -lTKMath" - # E.A. compatibility version 4 and 5.x - CAS_OCAF="$CAS_LDPATH -lPTKernel -lTKPShape -lTKCDF -lTKCAF -lTKShapeSchema -lTKPCAF -lFWOSPlugin -lTKStdSchema" - if test $OCC_VERSION_MAJOR -lt 5 ; then - CAS_OCAF="$CAS_OCAF -lTKPAppStd" - fi - if test -f $CASROOT/$casdir/lib/libPAppStdPlugin.so ; then - # this library is absent in CASCADE 5.2.3 - CAS_OCAF="$CAS_OCAF -lPAppStdPlugin" - CAS_STDPLUGIN="PAppStdPlugin" - fi - if test -f $CASROOT/$casdir/lib/libStdPlugin.so ; then - # this libraries are only for CASCADE 5.2.3 - CAS_STDPLUGIN="StdPlugin" - CAS_OCAF="$CAS_OCAF -lStdPlugin -lStdLPlugin -lTKLCAF -lTKPLCAF -lTKStdLSchema" - fi + CAS_OCAF="$CAS_LDPATH -lTKernel -lTKCDF -lTKLCAF" + CAS_OCAFVIS="$CAS_LDPATH -lTKCAF -lStdPlugin" - CAS_VIEWER="$CAS_LDPATH -lTKOpenGl -lTKV3d -lTKService" - CAS_MODELER="$CAS_LDPATH -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBO -lTKBool -lTKHLR -lTKFillet -lTKOffset -lTKFeat" + CAS_TKV3d="$CAS_LDPATH -lTKV3d" + CAS_VIEWER="$CAS_TKV3d -lTKService" - # E.A. compatibility version 4 and 5.x - CAS_DATAEXCHANGE="$CAS_LDPATH -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing" - if test $OCC_VERSION_MAJOR -lt 5 ; then - CAS_DATAEXCHANGE="$CAS_DATAEXCHANGE -lTKShHealingStd" - fi + CAS_TKBRep="$CAS_LDPATH -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep" + + CAS_TKTopAlgo="$CAS_TKBRep -lTKGeomAlgo -lTKTopAlgo" + CAS_TKPrim="$CAS_TKTopAlgo -lTKPrim" + + CAS_MODELER="$CAS_TKPrim -lTKBO -lTKBool -lTKHLR -lTKFillet -lTKOffset -lTKFeat" + CAS_DATAEXCHANGE="$CAS_LDPATH -lTKIGES -lTKSTEP" - CAS_LDFLAGS="$CAS_KERNEL $CAS_OCAF $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE" + CAS_LDFLAGS="$CAS_KERNEL $CAS_MATH $CAS_OCAF $CAS_OCAFVIS $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE" fi diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in index 8cc3f4c46..acd9fc70a 100644 --- a/salome_adm/unix/make_commence.in +++ b/salome_adm/unix/make_commence.in @@ -134,7 +134,10 @@ OCC_CXXFLAGS=@CAS_CXXFLAGS@ #OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@ #OCC_LIBS=@CAS_LDFLAGS@ CAS_KERNEL=@CAS_KERNEL@ +CAS_MATH=@CAS_MATH@ CAS_OCAF=@CAS_OCAF@ +CAS_OCAFVIS=@CAS_OCAFVIS@ +CAS_TKTopAlgo=@CAS_TKTopAlgo@ CAS_VIEWER=@CAS_VIEWER@ CAS_MODELER=@CAS_MODELER@ CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ diff --git a/src/CASCatch/Makefile.in b/src/CASCatch/Makefile.in index f6e17c1e8..f3477a8a5 100644 --- a/src/CASCatch/Makefile.in +++ b/src/CASCatch/Makefile.in @@ -24,7 +24,7 @@ LIB_SRC = CASCatch_Failure.cxx \ CPPFLAGS += $(OCC_INCLUDES) CXXFLAGS += $(OCC_CXXFLAGS) -LDFLAGS+= $(CAS_KERNEL) +LDFLAGS+= $(CAS_KERNEL) $(CAS_MATH) @CONCLUDE@ diff --git a/src/HDFPersist/Makefile.in b/src/HDFPersist/Makefile.in index fc3b4909e..b3d95e0c3 100644 --- a/src/HDFPersist/Makefile.in +++ b/src/HDFPersist/Makefile.in @@ -97,7 +97,6 @@ LIB_SRC = \ #BIN = test9 test8 CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) -DPCLINUX -LDFLAGS+= $(CAS_LDPATH) -lTKernel $(HDF5_LIBS) - +LDFLAGS+= $(CAS_KERNEL) $(HDF5_LIBS) @CONCLUDE@ diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in index fc2714c18..96fb1ae2a 100644 --- a/src/SALOMEDS/Makefile.in +++ b/src/SALOMEDS/Makefile.in @@ -119,7 +119,7 @@ BIN_CLIENT_IDL = CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) CXXFLAGS+=$(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOMELocalTrace -lSalomeDSImpl -lSalomeGenericObj $(CAS_LDPATH) -lTKernel -lTKCAF -lTKBO -lTKStdSchema -lSalomeGenericObj -lSalomeLifeCycleCORBA +LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOMELocalTrace -lSalomeDSImpl -lSalomeGenericObj $(CAS_KERNEL) -lSalomeGenericObj -lSalomeLifeCycleCORBA # _CS_gbo_090604 Ajout Spécifique Calibre 3, pour l'utilisation de la version 5.12 de la bibliothèque OCC. # La bibliothèque OCC5.12 a été compilée sur Calibre 3 avec l'extention Xmu (impossible de compiler sans). @@ -134,7 +134,7 @@ LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOME # LDXMUFLAGS= -L/usr/X11R6/lib -lXmu LDFLAGS+=$(LDXMUFLAGS) -LDFLAGSFORBIN= $(LDFLAGS) -lTKLCAF -lTKMath -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics +LDFLAGSFORBIN= $(LDFLAGS) $(CAS_OCAF) -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics @CONCLUDE@ diff --git a/src/SALOMEDSImpl/Makefile.in b/src/SALOMEDSImpl/Makefile.in index de9c3e58b..fa73429a9 100644 --- a/src/SALOMEDSImpl/Makefile.in +++ b/src/SALOMEDSImpl/Makefile.in @@ -117,7 +117,7 @@ LIB_SRC = SALOMEDSImpl_Tool.cxx \ CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) -LDFLAGS+= $(HDF5_LIBS) -lSalomeHDFPersist $(CAS_LDPATH) -lTKCAF -lTKBO -lTKLCAF -lTKMath -lTKStdSchema -lTKernel +LDFLAGS+= $(HDF5_LIBS) -lSalomeHDFPersist $(CAS_OCAF) # _CS_gbo_090604 Ajout Spécifique Calibre 3, pour l'utilisation de la version 5.12 de la bibliothèque OCC. # La bibliothèque OCC5.12 a été compilée sur Calibre 3 avec l'extention Xmu (impossible de compiler sans). diff --git a/src/TOOLSDS/Makefile.in b/src/TOOLSDS/Makefile.in index 866f491f1..1b41aefa7 100644 --- a/src/TOOLSDS/Makefile.in +++ b/src/TOOLSDS/Makefile.in @@ -29,7 +29,7 @@ BIN_CLIENT_IDL = CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) CXXFLAGS+=$(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -LDFLAGS+= -lOpUtil $(CAS_LDPATH) -lTKernel +LDFLAGS+= -lOpUtil $(CAS_KERNEL) @CONCLUDE@ -- 2.39.2