]> SALOME platform Git repositories - tools/documentation.git/commitdiff
Salome HOME
Synchronize adm files V7_7_0a1 V7_7_0b1
authorMaintenance team (INV) <mnt@opencascade.com>
Tue, 14 Jul 2015 18:36:14 +0000 (21:36 +0300)
committerMaintenance team (INV) <mnt@opencascade.com>
Tue, 14 Jul 2015 18:36:14 +0000 (21:36 +0300)
CMakeModules/SalomeMacros.cmake

index 7ed262265b68421ec63967f72a07d5c406c49375..6b43e227759ef3eef39db7ea4ebc9f7c7568242e 100644 (file)
@@ -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)