[Cmake-commits] [cmake-commits] david.cole committed GetPrerequisites.cmake 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv30376/Modules

Modified Files:
	GetPrerequisites.cmake 
Log Message:
ENH: Activate GetPrerequisites code on Linux. Thanks to Mike Arthur for finishing it off.


Index: GetPrerequisites.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/GetPrerequisites.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** GetPrerequisites.cmake	8 Sep 2008 15:23:01 -0000	1.4
--- GetPrerequisites.cmake	24 Oct 2008 15:39:10 -0000	1.5
***************
*** 70,76 ****
  
    if(NOT is_embedded)
!     if("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
!       set(is_system 1)
!     endif("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
  
      if(WIN32)
--- 70,84 ----
  
    if(NOT is_embedded)
!     if(UNIX)
!       if("${file}" MATCHES "^(/lib/|/lib32/|/lib64/)")
!         set(is_system 1)
!       endif("${file}" MATCHES "^(/lib/|/lib32/|/lib64/)")
!     endif(UNIX)
! 
!     if(APPLE)
!       if("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
!         set(is_system 1)
!       endif("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
!     endif(APPLE)
  
      if(WIN32)
***************
*** 407,411 ****
    if("${gp_tool}" STREQUAL "ldd")
      set(gp_cmd_args "")
!     set(gp_regex "^\t([\t ]+)[\t ].*${eol_char}$")
      set(gp_regex_cmp_count 1)
      set(gp_tool_known 1)
--- 415,419 ----
    if("${gp_tool}" STREQUAL "ldd")
      set(gp_cmd_args "")
!     set(gp_regex "^[\t ]*[^\t ]+ => ([^\t ]+).*${eol_char}$")
      set(gp_regex_cmp_count 1)
      set(gp_tool_known 1)