From: rnv <rnv@opencascade.com>
Date: Wed, 28 Aug 2019 16:33:00 +0000 (+0300)
Subject: Additional modification for Windows.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a44d82e37b9878ff46edbab345f765b54d59729b;p=tools%2Fconfiguration.git

Additional modification for Windows.
---

diff --git a/cmake/SalomeMacros.cmake b/cmake/SalomeMacros.cmake
index 80a3793..79c77e0 100644
--- 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})