Modification of SALOME building and launching scripts

diff --git a/CMakeCommon/FindSalome.cmake b/CMakeCommon/FindSalome.cmake
index c2403c2702b3d5f09110d1550ea54bad21a4d3e1..5b4ba143f3f4c8f2a1d50a3b2c810d94b08aca84 100644 (file)
--- a/CMakeCommon/FindSalome.cmake
+++ b/CMakeCommon/FindSalome.cmake
@@ -3,6 +3,7 @@
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL directory")
 SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI directory")
 IF(EXISTS ${GUI_ROOT_DIR})
+       MESSAGE("-- SALOME found at " ${GUI_ROOT_DIR})
        SET(HAVE_SALOME YES)
   
        FIND_LIBRARY(caf caf ${GUI_ROOT_DIR}/lib/salome)

diff --git a/build_vc9_Salome_deb.bat b/build_vc9_Salome_deb.bat
index cbf4e4927eba1163abb1cb00d024d72da76fa82a..50fc961bba439c5cd0bb4f11fc8a424fe07b172c 100644 (file)
--- a/build_vc9_Salome_deb.bat
+++ b/build_vc9_Salome_deb.bat
@@ -10,7 +10,7 @@ popd
 @SET SRC_DIR=%ROOT_DIR%\sources
 @SET OCC_LIB_PREFIX=d
 
-call %SRC_DIR%\msvc9_env_Salome.bat
+call %SRC_DIR%\msvc9_env_Salome.bat d
 mkdir %ROOT_DIR%\build
 cd %ROOT_DIR%\build
 

diff --git a/build_vc9_Salome_rel.bat b/build_vc9_Salome_rel.bat
new file mode 100644 (file)
index 0000000..90345fb
--- /dev/null
+++ b/build_vc9_Salome_rel.bat
@@ -0,0 +1,18 @@
+@ECHO OFF
+
+REM Find absolute path to ROOT_DIR 
+@SET PARENT_DIR=%~dp0..
+@SET ROOT_DIR=
+pushd %PARENT_DIR%
+@SET ROOT_DIR=%CD%
+popd
+
+@SET SRC_DIR=%ROOT_DIR%\sources
+
+call %SRC_DIR%\msvc9_env_Salome.bat
+mkdir %ROOT_DIR%\build
+cd %ROOT_DIR%\build
+
+cmake %SRC_DIR% -G "Visual Studio 9 2008" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%\install
+
+start "" %MSVC_EXE% NewGEOM.sln

diff --git a/msvc9_env_Salome.bat b/msvc9_env_Salome.bat
index 15317ad207b274479b452c7f05ce26564c502559..d09176f412b333e4111a5615599d013700a4fd22 100644 (file)
--- a/msvc9_env_Salome.bat
+++ b/msvc9_env_Salome.bat
@@ -18,9 +18,14 @@ if "%SALOME_ROOT_DIR%" == "" (
   set SALOME_ROOT_DIR=%ROOT_DIR%\SALOME
 )
 
-call "%SALOME_ROOT_DIR%\WORK\set_env.bat"
+if "%SOLVESPACE_ROOT_DIR%" == "" (
+  @SET SOLVESPACE_ROOT_DIR=%ROOT_DIR%\products\solvespace-2.0
+)
+
+call %SALOME_ROOT_DIR%\WORK\set_env.bat %1
 call "%PDIR%\env_compile.bat"
 
+
 @REM -------------------------
 @REM Python
 @SET PYTHON_LIB_DIR=%PYTHON_ROOT_DIR%\libs
@@ -58,8 +63,11 @@ call "%PDIR%\env_compile.bat"
 @SET PATH=%PDIR%\freetype-2.4.11\bin;%PATH%
 @SET PATH=%PDIR%\gl2ps-1.3.8\bin;%PATH%
 @SET PATH=%PDIR%\qwt-5.2.1\lib;%PATH%
+@SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
 @REM -------------------------
 
+
+
 IF "%ARCH%" == "Win64" (
   call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" x64
 ) ELSE (
@@ -72,6 +80,6 @@ IF "%ARCH%" == "Win64" (
 )
 
 @SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
-@SET PATH=%ROOT_DIR%\install\bin;%ROOT_DIR%\install\plugins;%PATH%
+@SET PATH=%PATH%;%ROOT_DIR%\install\bin;%ROOT_DIR%\install\plugins
 
 @SET LightAppConfig=%ROOT_DIR%\install\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui

diff --git a/salomeRun.bat b/salomeRun.bat
index 3738b2f179996c28ff14c24812ac86bcc16c2758..af7ebe40572c3ca9c06d6aadd1e5f145e7fab939 100644 (file)
--- a/salomeRun.bat
+++ b/salomeRun.bat
@@ -10,7 +10,19 @@ popd
 @SET SRC_DIR=%ROOT_DIR%\sources
 @SET OCC_LIB_PREFIX=d
 
-call %SRC_DIR%\msvc9_env_Salome.bat
+@SET SALOME_ROOT_DIR=%ROOT_DIR%\SALOME-7.3.0-WIN32
+@SET SOLVESPACE_ROOT_DIR=%ROOT_DIR%\products\solvespace-2.0
+@SET NEWGEOM_ROOT_DIR=%ROOT_DIR%\install
+@SET PATH=%SALOME_ROOT_DIR%;%PATH%
+
+
+call %SALOME_ROOT_DIR%\env_launch.bat
+
+@SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
+@SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
+@SET PATH=%PATH%;%NEWGEOM_ROOT_DIR%\bin;%NEWGEOM_ROOT_DIR%\plugins
+
+@SET LightAppConfig=%ROOT_DIR%\install\share\salome\resources\newgeom;%SALOME_ROOT_DIR%\MODULES\GUI\share\salome\resources\gui
 
 
 SuitApp.exe LightApp -style salome --modules=NewGeom --uselicense --noexcepthandling