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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeVerifyManifest.cmake 
Log Message:
Allow this to handle hand edited manifest files.


Index: CMakeVerifyManifest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeVerifyManifest.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CMakeVerifyManifest.cmake	21 Oct 2009 17:44:33 -0000	1.4
--- CMakeVerifyManifest.cmake	27 Oct 2009 20:01:47 -0000	1.5
***************
*** 37,41 ****
  # specified by list_var
  function(crt_version file list_var)
!   file(STRINGS "${file}" strings REGEX "Microsoft.VC...CRT")
    foreach(s ${strings})
      set(has_match 1)
--- 37,41 ----
  # specified by list_var
  function(crt_version file list_var)
!   file(STRINGS "${file}" strings REGEX "Microsoft.VC...CRT" NEWLINE_CONSUME)
    foreach(s ${strings})
      set(has_match 1)
***************
*** 90,93 ****
--- 90,97 ----
    crt_version("${f}" manifest_version_list)
  endforeach(f)
+ list(LENGTH manifest_version_list LEN)
+ if(LEN EQUAL 0)
+   message(FATAL_ERROR "No .manifest files found, no version check can be done.")
+ endif()
  message("Versions found in ${manifest_files}: ${manifest_version_list}")
  if(DEFINED allow_versions)