Build/AtlasLCG/modules/LCGFunctions.cmake

@@ -64,7 +64,9 @@ function( lcg_external_module )
    if( ${nameUpper}_LCGROOT )
       list( APPEND CMAKE_SYSTEM_IGNORE_PATH /usr/include
          /usr/bin /usr/bin32 /usr/bin64
-         /usr/lib /usr/lib32 /usr/lib64 )
+         /usr/lib /usr/lib32 /usr/lib64
+         /bin /bin32 /bin64
+         /lib /lib32 /lib64 )
       list( REMOVE_DUPLICATES CMAKE_SYSTEM_IGNORE_PATH )
       list( APPEND ARG_EXTRA_OPTIONS
          NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH )
@@ -551,7 +553,7 @@ function( lcg_generate_env )
    endforeach()
 
    # Paths considered "system paths".
-   set( LCG_IGNORED_SYSTEM_PATHS "(/usr|/usr/local)" CACHE STRING
+   set( LCG_IGNORED_SYSTEM_PATHS "(/|/usr|/usr/local)" CACHE STRING
         "Regular expression specifying which paths are system paths" )
    mark_as_advanced( LCG_IGNORED_SYSTEM_PATHS )
 
@@ -1039,7 +1041,7 @@ macro( lcg_wrap_find_module name )
    if( ${name}_LCGROOT OR ${_nameUpper}_LCGROOT )
       set( _ignorePathBackup ${CMAKE_SYSTEM_IGNORE_PATH} )
       set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/bin32 /usr/bin64
-         /usr/lib /usr/lib32 /usr/lib64 )
+         /usr/lib /usr/lib32 /usr/lib64 /bin /bin32 /bin64 /lib /lib32 /lib64 )
    endif()
 
    # Set up the LCG_SYSTEM_IGNORE_PATH cache variable.

Projects/AnalysisBaseExternals/ProjectOptions.cmake

@@ -29,7 +29,7 @@ else()
    # or from a custom/user build. As in general we can't accept Python
    # from the system.
    get_filename_component( _pythonDir ${PYTHON_EXECUTABLE} DIRECTORY )
-   if( ${_pythonDir} STREQUAL "/usr/bin" )
+   if( "${_pythonDir}" MATCHES "^(/usr)?/bin(32|64)?$" )
       # Since that's not appropriate for us... :-(
       set( _flag TRUE )
    endif()