[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.126 1.127

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Add -D preprocessor defines to the moc commands.
      Needed to fix #7465.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.126
retrieving revision 1.127
diff -C 2 -d -r1.126 -r1.127
*** FindQt4.cmake	17 Aug 2008 09:11:51 -0000	1.126
--- FindQt4.cmake	25 Aug 2008 23:41:56 -0000	1.127
***************
*** 526,533 ****
    #############################################
  
-   IF (QT_USE_FRAMEWORKS)
-     SET(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} )
-   ENDIF (QT_USE_FRAMEWORKS)
- 
    # Set QT_QT3SUPPORT_INCLUDE_DIR
    FIND_PATH(QT_QT3SUPPORT_INCLUDE_DIR Qt3Support
--- 526,529 ----
***************
*** 1042,1057 ****
    ENDMACRO (QT4_MAKE_OUTPUT_FILE )
  
!   MACRO (QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
!      SET(${_moc_INC_DIRS})
       GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
  
       FOREACH(_current ${_inc_DIRS})
!         SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
       ENDFOREACH(_current ${_inc_DIRS})
  
!   ENDMACRO(QT4_GET_MOC_INC_DIRS)
  
    # helper macro to set up a moc rule
!   MACRO (QT4_CREATE_MOC_COMMAND infile outfile moc_includes moc_options)
      # For Windows, create a parameters file to work around command line length limit
      IF (WIN32)
--- 1038,1057 ----
    ENDMACRO (QT4_MAKE_OUTPUT_FILE )
  
!   MACRO (QT4_GET_MOC_FLAGS _moc_flags)
!      SET(${_moc_flags})
       GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
  
       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})
  
!   ENDMACRO(QT4_GET_MOC_FLAGS)
  
    # helper macro to set up a moc rule
!   MACRO (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
      # For Windows, create a parameters file to work around command line length limit
      IF (WIN32)
***************
*** 1067,1071 ****
        ENDIF(_moc_outfile_dir)
        SET (_moc_parameters_file ${outfile}_parameters)
!       SET (_moc_parameters ${moc_includes} ${moc_options} -o "${outfile}" "${infile}")
        FILE (REMOVE ${_moc_parameters_file})
        FOREACH(arg ${_moc_parameters})
--- 1067,1071 ----
        ENDIF(_moc_outfile_dir)
        SET (_moc_parameters_file ${outfile}_parameters)
!       SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
        FILE (REMOVE ${_moc_parameters_file})
        FOREACH(arg ${_moc_parameters})
***************
*** 1080,1084 ****
        ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
                           COMMAND ${QT_MOC_EXECUTABLE}
!                          ARGS ${moc_includes} ${moc_options} -o ${outfile} ${infile}
                           DEPENDS ${infile})     
      ENDIF (WIN32)
--- 1080,1084 ----
        ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
                           COMMAND ${QT_MOC_EXECUTABLE}
!                          ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
                           DEPENDS ${infile})     
      ENDIF (WIN32)
***************
*** 1087,1093 ****
    
    MACRO (QT4_GENERATE_MOC infile outfile )
!      QT4_GET_MOC_INC_DIRS(moc_includes)
       GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
!      QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_includes}" "")
       SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
    ENDMACRO (QT4_GENERATE_MOC)
--- 1087,1093 ----
    
    MACRO (QT4_GENERATE_MOC infile outfile )
!      QT4_GET_MOC_FLAGS(moc_flags)
       GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
!      QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_flags}" "")
       SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
    ENDMACRO (QT4_GENERATE_MOC)
***************
*** 1098,1102 ****
    MACRO (QT4_WRAP_CPP outfiles )
      # get include dirs
!     QT4_GET_MOC_INC_DIRS(moc_includes)
      QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
  
--- 1098,1102 ----
    MACRO (QT4_WRAP_CPP outfiles )
      # get include dirs
!     QT4_GET_MOC_FLAGS(moc_flags)
      QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
  
***************
*** 1104,1108 ****
        GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
        QT4_MAKE_OUTPUT_FILE(${it} moc_ cxx outfile)
!       QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_includes}" "${moc_options}")
        SET(${outfiles} ${${outfiles}} ${outfile})
      ENDFOREACH(it)
--- 1104,1108 ----
        GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
        QT4_MAKE_OUTPUT_FILE(${it} moc_ cxx outfile)
!       QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
        SET(${outfiles} ${${outfiles}} ${outfile})
      ENDFOREACH(it)
***************
*** 1248,1252 ****
  
     MACRO(QT4_AUTOMOC)
!       QT4_GET_MOC_INC_DIRS(_moc_INCS)
  
        SET(_matching_FILES )
--- 1248,1252 ----
  
     MACRO(QT4_AUTOMOC)
!       QT4_GET_MOC_FLAGS(_moc_INCS)
  
        SET(_matching_FILES )