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 e7e10c9a58137c7eda1749796f360a4cdd51de6d..5e556548ee82b6c7d7c3ddb94a5b34e12c35bc8e 100644 (file)
--- 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 f5fe81b86444a67cbcad744d962cdb5aeb168b1f..2d727cef80613df69a9e7a9527291a0cf25bc70b 100644 (file)
--- 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 762fbf70d9236bb8bb702c81e9caf0c2b50795cb..385d643a5809598ad038d4b93448a4b5ff1d846b 100644 (file)
--- 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@