Additional modification for Windows.

diff --git a/cmake/SalomeMacros.cmake b/cmake/SalomeMacros.cmake
index 80a37936f9ff594b4c334347ab75f8e273705f72..79c77e06442e7aa080990769324f34d1a7be1921 100644 (file)
--- a/cmake/SalomeMacros.cmake
+++ b/cmake/SalomeMacros.cmake
@@ -846,10 +846,10 @@ MACRO(SALOME_GENERATE_ENVIRONMENT_SCRIPT output script cmd opts)
   ENDIF()
   
   SET(_env "")
+  IF(WIN32 AND SALOME_GENERATE_ENVIRONMENT_SCRIPT_CONTEXT)
+    SET(_env "IF ${_env}\"%SET_${SALOME_GENERATE_ENVIRONMENT_SCRIPT_CONTEXT}_VARS%\"==\"1\" GOTO ${_ctx}\n")
+  ENDIF()
   IF (NOT "$ENV{SALOME_HAS_GLOBAL_ENV}" STREQUAL "1")
-    IF(WIN32 AND SALOME_GENERATE_ENVIRONMENT_SCRIPT_CONTEXT)
-      SET(_env "IF ${_env}\"%SET_${SALOME_GENERATE_ENVIRONMENT_SCRIPT_CONTEXT}_VARS%\"==\"1\" GOTO ${_ctx}\n")
-    ENDIF()
     FOREACH(_item ${_${PROJECT_NAME}_EXTRA_ENV})
       FOREACH(_val ${_${PROJECT_NAME}_EXTRA_ENV_${_item}})
         SALOME_DO_VAR_SUBSTITUTION(_env ${_item} ${_val})