From: mpa <mpa@opencascade.com>
Date: Tue, 14 Jul 2015 12:13:39 +0000 (+0300)
Subject: 0023066: [CEA 1509] CMake - Installation of a SALOME module should be movable
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=306d003a1529cd524f823ca142016dc37163a0ff;p=modules%2Fyacs.git

0023066: [CEA 1509] CMake - Installation of a SALOME module should be movable
---

diff --git a/salome_adm/cmake_files/SalomeMacros.cmake b/salome_adm/cmake_files/SalomeMacros.cmake
index 7ed262265..6b43e2277 100644
--- a/salome_adm/cmake_files/SalomeMacros.cmake
+++ b/salome_adm/cmake_files/SalomeMacros.cmake
@@ -752,7 +752,8 @@ MACRO(SALOME_ACCUMULATE_ENVIRONMENT envvar)
   ENDIF()
   SET(_${PROJECT_NAME}_EXTRA_ENV_FULL "SET\(${PROJECT_NAME}_EXTRA_ENV ${_${PROJECT_NAME}_EXTRA_ENV}\)")
   FOREACH(_res ${_${PROJECT_NAME}_EXTRA_ENV})
-    SET(_${PROJECT_NAME}_EXTRA_ENV_FULL "${_${PROJECT_NAME}_EXTRA_ENV_FULL}\nSET\(${PROJECT_NAME}_EXTRA_ENV_${_res} ${_${PROJECT_NAME}_EXTRA_ENV_${_res}}\)")
+    STRING(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${PACKAGE_PREFIX_DIR}" _res_path "${_${PROJECT_NAME}_EXTRA_ENV_${_res}}")
+    SET(_${PROJECT_NAME}_EXTRA_ENV_FULL "${_${PROJECT_NAME}_EXTRA_ENV_FULL}\nSET\(${PROJECT_NAME}_EXTRA_ENV_${_res} ${_res_path}\)")
   ENDFOREACH()
 ENDMACRO(SALOME_ACCUMULATE_ENVIRONMENT)