Changes in linux environment: SALOME instalation folder became a "products" directory

diff --git a/CMakeCommon/FindSUIT.cmake b/CMakeCommon/FindSUIT.cmake
index 608abeded9a17d87f54b6c45bb763ce6b90ff8e9..daca7d986e6eae89ee8a09a9dd4e1ac51b30648b 100644 (file)
--- a/CMakeCommon/FindSUIT.cmake
+++ b/CMakeCommon/FindSUIT.cmake
@@ -1,22 +1,24 @@
 
 SET(SUIT_DIR $ENV{SUIT_DIR})
 IF(EXISTS ${SUIT_DIR})
-       MESSAGE(STATUS "SUIT found at ${SUIT_DIR}")
+
+    MESSAGE(STATUS "SUIT found at ${SUIT_DIR}")
     IF(WIN32)
         SET(SUIT_LIB_DIR ${SUIT_DIR}/lib)
     ElSE()
         SET(SUIT_LIB_DIR ${SUIT_DIR}/lib/salome)
     ENDIF()
-       FIND_LIBRARY(Event Event ${SUIT_LIB_DIR})
-       FIND_LIBRARY(PyConsole PyConsole ${SUIT_LIB_DIR})
-       FIND_LIBRARY(PyInterp PyInterp ${SUIT_LIB_DIR})
-       FIND_LIBRARY(qtx qtx ${SUIT_LIB_DIR})
-       FIND_LIBRARY(suit suit ${SUIT_LIB_DIR})
+
+    FIND_LIBRARY(Event Event ${SUIT_LIB_DIR})
+    FIND_LIBRARY(PyConsole PyConsole ${SUIT_LIB_DIR})
+    FIND_LIBRARY(PyInterp PyInterp ${SUIT_LIB_DIR})
+    FIND_LIBRARY(qtx qtx ${SUIT_LIB_DIR})
+    FIND_LIBRARY(suit suit ${SUIT_LIB_DIR})
 
     IF(WIN32)
-           SET(SUIT_INCLUDE ${SUIT_DIR}/include)
+        SET(SUIT_INCLUDE ${SUIT_DIR}/include)
     ElSE()
         SET(SUIT_INCLUDE ${SUIT_DIR}/include/salome)
     ENDIF()
-       
+
 ENDIF(EXISTS ${SUIT_DIR})

diff --git a/linux_env.sh b/linux_env.sh
index bf97da26070b2e7972d33ddb1a9eee1cc78f0671..684c8ddfe3528891404a5503d4c0288cf3a321f3 100644 (file)
--- a/linux_env.sh
+++ b/linux_env.sh
@@ -1,7 +1,7 @@
 #------ Setting products installation directory ------
 
 if [ "${PDIR}" = "" ] ; then
-    export PDIR=/dn48/newgeom/common/products
+    export PDIR=/dn48/newgeom/common/SALOME-7.4.0
 fi
 
 # Find absolute path to ROOT_DIR
@@ -40,8 +40,7 @@ export FREETYPE_ROOT_DIR=${PDIR}/freetype-2.4.11
 export LD_LIBRARY_PATH=${FREETYPE_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
 ##
 #------ freeimage ------
-export FREEIMAGE_ROOT_DIR=${PDIR}/freeimage-3.15.4
-export PATH=${FREEIMAGE_ROOT_DIR}/bin:${PATH}
+export FREEIMAGE_ROOT_DIR=${PDIR}/freeimage-3.16.0
 export LD_LIBRARY_PATH=${FREEIMAGE_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
 ##
 #------ gl2ps ------
@@ -66,31 +65,35 @@ export LD_LIBRARY_PATH=${SOLVESPACE_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
 #------ OCCT ------
 export CAS_ROOT_DIR=${PDIR}/OCCT-6.7.1
 
-export PATH=${CAS_ROOT_DIR}/bin:${PATH}
+#------ lcov ------
+export LCOV_ROOT_DIR=${PDIR}/lcov-1.11
+export PATH=${LCOV_ROOT_DIR}/bin:${PATH}
+
+#------ SUIT ------
+export SUIT_DIR=${PDIR}/GUI_7.4.0
+export PATH=${SUIT_DIR}/bin/salome:${PATH}
+export LD_LIBRARY_PATH=${SUIT_DIR}/lib/salome:${LD_LIBRARY_PATH}
+
+# CAS_ROOT_DIR has to be in the PATH for CMake's FindCAS procedures
+export PATH=${CAS_ROOT_DIR}:${CAS_ROOT_DIR}/bin:${PATH}
 export LD_LIBRARY_PATH=${CAS_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
 export CSF_GraphicShr=${CAS_ROOT_DIR}/lib/libTKOpenGl.so
-# Variable for Foundation Classes : 
-export CSF_UnitsLexicon=${CAS_ROOT_DIR}/src/UnitsAPI/Lexi_Expr.dat 
-export CSF_UnitsDefinition=${CAS_ROOT_DIR}/src/UnitsAPI/Units.dat 
-# Variable for DataExchange : 
+# Variable for Foundation Classes :
+export CSF_UnitsLexicon=${CAS_ROOT_DIR}/src/UnitsAPI/Lexi_Expr.dat
+export CSF_UnitsDefinition=${CAS_ROOT_DIR}/src/UnitsAPI/Units.dat
+# Variable for DataExchange :
 export CSF_SHMessage=${CAS_ROOT_DIR}/src/SHMessage
-export CSF_XSMessage=${CAS_ROOT_DIR}/src/XSMessage 
-# Variable for Font : 
-export CSF_MDTVFontDirectory=${CAS_ROOT_DIR}/src/FontMFT 
+export CSF_XSMessage=${CAS_ROOT_DIR}/src/XSMessage
+# Variable for Font :
+export CSF_MDTVFontDirectory=${CAS_ROOT_DIR}/src/FontMFT
 export CSF_MDTVTexturesDirectory=${CAS_ROOT_DIR}/src/Textures
 # Defaults
-export CSF_PluginDefaults=${CAS_ROOT_DIR}/src/StdResource 
+export CSF_PluginDefaults=${CAS_ROOT_DIR}/src/StdResource
 export CSF_StandardDefaults=${CAS_ROOT_DIR}/src/StdResource
 # Activation of OCCT Kernel multithreading :
 export MMGT_REENTRANT=1
-
-#------ lcov ------
-export LCOV_ROOT_DIR=${PDIR}/lcov-1.11
-export PATH=${LCOV_ROOT_DIR}/bin:${PATH}
-
-#------ SUIT ------
-export SUIT_DIR=${PDIR}/suit
-export LD_LIBRARY_PATH=${SUIT_DIR}/lib/salome:${LD_LIBRARY_PATH}
+# For CMake
+export LIB=${LD_LIBRARY_PATH}
 
 #------ NewGEOM ------
 export NEW_GEOM_ROOT_DIR=${ROOT_DIR}/install