From a44d82e37b9878ff46edbab345f765b54d59729b Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 28 Aug 2019 19:33:00 +0300 Subject: [PATCH] Additional modification for Windows. --- cmake/SalomeMacros.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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}) -- 2.39.2