[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.114 1.115

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

BUG:  Fix problem with last patch when trying to take substr of shorter strings
      than expected.  Fixes #6730.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.114
retrieving revision 1.115
diff -C 2 -d -r1.114 -r1.115
*** FindQt4.cmake	7 Apr 2008 15:23:02 -0000	1.114
--- FindQt4.cmake	7 Apr 2008 23:43:04 -0000	1.115
***************
*** 994,998 ****
    MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
      STRING(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
!     STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
      IF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
        FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
--- 994,1002 ----
    MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
      STRING(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
!     STRING(LENGTH ${infile} _infileLength)
!     SET(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR})
!     IF(_infileLength GREATER _binlength)
!       STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
!     ENDIF(_infileLength GREATER _binlength)
      IF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
        FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})