[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.128 1.129

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Aug 26 11:50:17 EDT 2008


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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Use COMPILE_DEFINTIONS instead of DEFINITIONS.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.128
retrieving revision 1.129
diff -C 2 -d -r1.128 -r1.129
*** FindQt4.cmake	26 Aug 2008 15:22:27 -0000	1.128
--- FindQt4.cmake	26 Aug 2008 15:50:15 -0000	1.129
***************
*** 1043,1052 ****
  
       FOREACH(_current ${_inc_DIRS})
!         SET(${_moc_flags} ${${_moc_flags}} "-I" ${_current})
       ENDFOREACH(_current ${_inc_DIRS})
       
!      GET_DIRECTORY_PROPERTY(_defines DEFINITIONS)
!      SEPARATE_ARGUMENTS(_defines)
!      SET(${_moc_flags} ${${_moc_flags}} ${_defines})
       IF(Q_WS_WIN)
         SET(${_moc_flags} ${${_moc_flags}} -DWIN32)
--- 1043,1054 ----
  
       FOREACH(_current ${_inc_DIRS})
!         SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
       ENDFOREACH(_current ${_inc_DIRS})
       
!      GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS)
!      FOREACH(_current ${_defines})
!         SET(${_moc_flags} ${${_moc_flags}} "-D${_current}")
!      ENDFOREACH(_current ${_defines})
! 
       IF(Q_WS_WIN)
         SET(${_moc_flags} ${${_moc_flags}} -DWIN32)



More information about the Cmake-commits mailing list