[Cmake-commits] [cmake-commits] hoffman committed CMakeVerifyManifest.cmake 1.5 1.6

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeVerifyManifest.cmake 
Log Message:
clean up to work with manifest files better.


Index: CMakeVerifyManifest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeVerifyManifest.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** CMakeVerifyManifest.cmake	27 Oct 2009 20:01:47 -0000	1.5
--- CMakeVerifyManifest.cmake	28 Oct 2009 14:29:24 -0000	1.6
***************
*** 41,45 ****
      set(has_match 1)
      string(REGEX
!       REPLACE ".*version=.([^\"]*). (.*)$" "\\1" 
        version "${s}")
      if(NOT "${version}" STREQUAL "")
--- 41,45 ----
      set(has_match 1)
      string(REGEX
!       REPLACE ".*<assembly.*\"Microsoft.VC...CRT\".*version=\"([^\"]*)\".*</assembly>.*$" "\\1" 
        version "${s}")
      if(NOT "${version}" STREQUAL "")
***************
*** 73,77 ****
      list(FIND manifest_versions "${ver}" found_version)
      if("${found_version}" EQUAL -1)
!       message("ERROR: ${file} uses ${ver} not found in shipped manifest.")
        set(fatal_error TRUE PARENT_SCOPE)
      endif()
--- 73,77 ----
      list(FIND manifest_versions "${ver}" found_version)
      if("${found_version}" EQUAL -1)
!       message("ERROR: ${file} uses ${ver} not found in shipped manifests:[${manifest_versions}].")
        set(fatal_error TRUE PARENT_SCOPE)
      endif()
***************
*** 105,109 ****
  set(exe_files ${exe_files} ${dll_files})
  foreach(f ${exe_files})
!   check_version(${f} ${manifest_version_list})
  endforeach()
  
--- 105,109 ----
  set(exe_files ${exe_files} ${dll_files})
  foreach(f ${exe_files})
!   check_version(${f} "${manifest_version_list}")
  endforeach()
  
***************
*** 111,115 ****
  # a non zero value
  if(fatal_error)
!   message(FATAL_ERROR "This distribution has mis-matched dll"
!     " versions and may not work on other machines.")
  endif()
--- 111,115 ----
  # a non zero value
  if(fatal_error)
!   message(FATAL_ERROR "This distribution embeds dll "
!     " versions that it does not ship, and may not work on other machines.")
  endif()