[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.171 1.172

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
When getting include dirs for moc, also watch for framework includes and use -F instead of -I.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.171
retrieving revision 1.172
diff -C 2 -d -r1.171 -r1.172
*** FindQt4.cmake	4 Oct 2009 15:31:30 -0000	1.171
--- FindQt4.cmake	5 Oct 2009 15:21:30 -0000	1.172
***************
*** 1033,1037 ****
  
       FOREACH(_current ${_inc_DIRS})
!         SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
       ENDFOREACH(_current ${_inc_DIRS})
       
--- 1033,1042 ----
  
       FOREACH(_current ${_inc_DIRS})
!         IF("${_current}" MATCHES ".framework/?$")
!           STRING(REGEX REPLACE "/[^/]+.framework" "" framework_path "${_current}")
!           SET(${_moc_flags} ${${_moc_flags}} "-F${framework_path}")
!         ELSE("${_current}" MATCHES ".framework/?$")
!           SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
!         ENDIF("${_current}" MATCHES ".framework/?$")
       ENDFOREACH(_current ${_inc_DIRS})