From: mkr <mkr@opencascade.com>
Date: Wed, 16 Nov 2005 12:00:03 +0000 (+0000)
Subject: Add new variable for finding OCC libraries during compilation.
X-Git-Tag: V3_1_0a3~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9dbbb779fa821772ea2187c8d4a92797b66813d4;p=modules%2Fsmesh.git

Add new variable for finding OCC libraries during compilation.
---

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index e7e10c9a5..5e556548e 100644
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -108,6 +108,7 @@ OCC_VIEWER_LIBS=@CAS_VIEWER@
 OCC_MODELER_LIBS=@CAS_MODELER@
 OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@
 OCC_LIBS=@CAS_LDFLAGS@
+OCC_LDPATH=@CAS_LDPATH@
 
 # MPICH
 
diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in
index f5fe81b86..2d727cef8 100644
--- a/src/SMESH_I/Makefile.in
+++ b/src/SMESH_I/Makefile.in
@@ -90,7 +90,7 @@ CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 
 LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry -lSalomeHDFPersist -lSalomeLifeCycleCORBA -lTOOLSDS -lSalomeGenericObj \
 	  -L${GEOM_ROOT_DIR}/lib/salome -lGEOMClient -lSMESHimpl -lSMESHControls \
-    -L${CASROOT}/lin/lib -lTKCDF -lTKBO
+    $(OCC_LDPATH) -lTKCDF -lTKBO
 
 
 LDFLAGSFORBIN += -lSMDS -lSMESHDS \
@@ -100,6 +100,6 @@ LDFLAGSFORBIN += -lSMDS -lSMESHDS \
 		-lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeNotification -lCASCatch \
 		-lSalomeHDFPersist -lSalomeLifeCycleCORBA -lTOOLSDS -lSalomeGenericObj \
 	  	-L${GEOM_ROOT_DIR}/lib/salome -lGEOMClient -lSMESHimpl -lSMESHControls -lNMTTools -lNMTDS \
-     -L${CASROOT}/lin/lib -lTKCDF -lTKBO -lTKMath
+     $(OCC_LDPATH) -lTKCDF -lTKBO -lTKMath
 
 @CONCLUDE@
diff --git a/src/StdMeshers/Makefile.in b/src/StdMeshers/Makefile.in
index 762fbf70d..385d643a5 100644
--- a/src/StdMeshers/Makefile.in
+++ b/src/StdMeshers/Makefile.in
@@ -87,6 +87,6 @@ BIN_SRC =
 CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
 CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
 
-LDFLAGS+= -lSMESHimpl -lMEFISTO2D -L${CASROOT}/Linux/lib -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome
+LDFLAGS+= -lSMESHimpl -lMEFISTO2D $(OCC_LDPATH) -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome
 
 @CONCLUDE@