]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
CMake: Add for checking an argument that this is not a standard system path (starting...
authormpa <mpa@opencascade.com>
Thu, 31 Oct 2013 07:50:39 +0000 (07:50 +0000)
committermpa <mpa@opencascade.com>
Thu, 31 Oct 2013 07:50:39 +0000 (07:50 +0000)
salome_adm/cmake_files/SalomeMacros.cmake

index 658e3f688a0fa8b78566a29f79360fcb4b264ec1..38e29a2104f0bec8d141f019ddc96c939be51faf 100755 (executable)
@@ -680,10 +680,10 @@ MACRO(SALOME_ACCUMULATE_ENVIRONMENT envvar)
           IF(TARGET ${_item})
             GET_TARGET_PROPERTY(_item ${_item} LOCATION)
           ENDIF()        
-          GET_FILENAME_COMPONENT(_item ${_item} PATH)  
+          GET_FILENAME_COMPONENT(_item ${_item} PATH)
         ENDIF()    
         IF(EXISTS ${_item})
-          STRING(REGEX MATCH "^/usr" _usr_find ${_item})
+          STRING(REGEX MATCH "^(/usr|/lib|/bin)" _usr_find ${_item})
           LIST(FIND _${PROJECT_NAME}_EXTRA_ENV_${envvar} ${_item} _res)
           IF(NOT _usr_find AND _res EQUAL -1)
               LIST(APPEND _${PROJECT_NAME}_EXTRA_ENV_${envvar} ${_item})