1 files changed, 158 insertions, 161 deletions
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
index b7f785b716..f234a240a1 100644
--- a/src/corelib/Qt5CoreMacros.cmake
+++ b/src/corelib/Qt5CoreMacros.cmake
@@ -39,167 +39,164 @@
 include(CMakeParseArguments)
 
 # macro used to create the names of output files preserving relative dirs
-MACRO (QT5_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)
-    IF(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-      FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
-    ELSE(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-      FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
-    ENDIF(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  ELSE(_infileLength GREATER _binlength)
-    FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
-  ENDIF(_infileLength GREATER _binlength)
-  IF(WIN32 AND rel MATCHES "^[a-zA-Z]:") # absolute path
-    STRING(REGEX REPLACE "^([a-zA-Z]):(.*)$" "\\1_\\2" rel "${rel}")
-  ENDIF(WIN32 AND rel MATCHES "^[a-zA-Z]:")
-  SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
-  STRING(REPLACE ".." "__" _outfile ${_outfile})
-  GET_FILENAME_COMPONENT(outpath ${_outfile} PATH)
-  GET_FILENAME_COMPONENT(_outfile ${_outfile} NAME_WE)
-  FILE(MAKE_DIRECTORY ${outpath})
-  SET(${outfile} ${outpath}/${prefix}${_outfile}.${ext})
-ENDMACRO (QT5_MAKE_OUTPUT_FILE )
-
-
-MACRO (QT5_GET_MOC_FLAGS _moc_flags)
-  SET(${_moc_flags})
-  GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
-
-  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})
-
-  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)
-  ENDIF(Q_WS_WIN)
-
-ENDMACRO(QT5_GET_MOC_FLAGS)
+macro(QT5_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)
+        if(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+            file(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
+        else()
+            file(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
+        endif()
+    else()
+        file(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
+    endif()
+    if(WIN32 AND rel MATCHES "^[a-zA-Z]:") # absolute path
+        string(REGEX REPLACE "^([a-zA-Z]):(.*)$" "\\1_\\2" rel "${rel}")
+    endif()
+    set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
+    string(REPLACE ".." "__" _outfile ${_outfile})
+    get_filename_component(outpath ${_outfile} PATH)
+    get_filename_component(_outfile ${_outfile} NAME_WE)
+    file(MAKE_DIRECTORY ${outpath})
+    set(${outfile} ${outpath}/${prefix}${_outfile}.${ext})
+endmacro()
+
+
+macro(QT5_GET_MOC_FLAGS _moc_flags)
+    set(${_moc_flags})
+    get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES)
+
+    foreach(_current ${_inc_DIRS})
+        if("${_current}" MATCHES "\\.framework/?$")
+            string(REGEX REPLACE "/[^/]+\\.framework" "" framework_path "${_current}")
+            set(${_moc_flags} ${${_moc_flags}} "-F${framework_path}")
+        else()
+            set(${_moc_flags} ${${_moc_flags}} "-I${_current}")
+        endif()
+    endforeach()
+
+    get_directory_property(_defines COMPILE_DEFINITIONS)
+    foreach(_current ${_defines})
+        set(${_moc_flags} ${${_moc_flags}} "-D${_current}")
+    endforeach()
+
+    if(Q_WS_WIN)
+        set(${_moc_flags} ${${_moc_flags}} -DWIN32)
+    endif()
+endmacro()
 
 
 # helper macro to set up a moc rule
-MACRO (QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
-  # For Windows, create a parameters file to work around command line length limit
-  IF (WIN32)
-    # Pass the parameters in a file.  Set the working directory to
-    # be that containing the parameters file and reference it by
-    # just the file name.  This is necessary because the moc tool on
-    # MinGW builds does not seem to handle spaces in the path to the
-    # file given with the @ syntax.
-    GET_FILENAME_COMPONENT(_moc_outfile_name "${outfile}" NAME)
-    GET_FILENAME_COMPONENT(_moc_outfile_dir "${outfile}" PATH)
-    IF(_moc_outfile_dir)
-      SET(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
-    ENDIF(_moc_outfile_dir)
-    SET (_moc_parameters_file ${outfile}_parameters)
-    SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
-    STRING (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
-    FILE (WRITE ${_moc_parameters_file} "${_moc_parameters}")
-    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-                       COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters
-                       DEPENDS ${infile}
-                       ${_moc_working_dir}
-                       VERBATIM)
-  ELSE (WIN32)
-    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-                       COMMAND ${QT_MOC_EXECUTABLE}
-                       ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
-                       DEPENDS ${infile} VERBATIM)
-  ENDIF (WIN32)
-ENDMACRO (QT5_CREATE_MOC_COMMAND)
-
-
-MACRO (QT5_GENERATE_MOC infile outfile )
-# get include dirs and flags
-   QT5_GET_MOC_FLAGS(moc_flags)
-   GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
-   SET(_outfile "${outfile}")
-   IF(NOT IS_ABSOLUTE "${outfile}")
-     SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
-   ENDIF(NOT IS_ABSOLUTE "${outfile}")
-   QT5_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" "")
-   SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
-ENDMACRO (QT5_GENERATE_MOC)
-
-
-# QT5_WRAP_CPP(outfiles inputfile ... )
-
-MACRO (QT5_WRAP_CPP outfiles )
-  # get include dirs
-  QT5_GET_MOC_FLAGS(moc_flags)
-
-  set(options)
-  set(oneValueArgs)
-  set(multiValueArgs OPTIONS)
-
-  cmake_parse_arguments(_WRAP_CPP "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  set(moc_files ${_WRAP_CPP_UNPARSED_ARGUMENTS})
-  set(moc_options ${_WRAP_CPP_OPTIONS})
-  FOREACH (it ${moc_files})
-    GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
-    QT5_MAKE_OUTPUT_FILE(${it} moc_ cxx outfile)
-    QT5_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
-    SET(${outfiles} ${${outfiles}} ${outfile})
-  ENDFOREACH(it)
-
-ENDMACRO (QT5_WRAP_CPP)
-
-
-# QT5_ADD_RESOURCES(outfiles inputfile ... )
-
-MACRO (QT5_ADD_RESOURCES outfiles )
-
-  set(options)
-  set(oneValueArgs)
-  set(multiValueArgs OPTIONS)
-
-  cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
-  set(rcc_options ${_RCC_OPTIONS})
-
-  FOREACH (it ${rcc_files})
-    GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
-    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-    GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
-    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
-    #  parse file for dependencies
-    #  all files are absolute paths or relative to the location of the qrc file
-    FILE(READ "${infile}" _RC_FILE_CONTENTS)
-    STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
-    SET(_RC_DEPENDS)
-    FOREACH(_RC_FILE ${_RC_FILES})
-      STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
-      IF(NOT IS_ABSOLUTE "${_RC_FILE}")
-        SET(_RC_FILE "${rc_path}/${_RC_FILE}")
-      ENDIF(NOT IS_ABSOLUTE "${_RC_FILE}")
-      SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
-    ENDFOREACH(_RC_FILE)
-    # Since this cmake macro is doing the dependency scanning for these files,
-    # let's make a configured file and add it as a dependency so cmake is run
-    # again when dependencies need to be recomputed.
-    QT5_MAKE_OUTPUT_FILE("${infile}" "" "qrc.depends" out_depends)
-    CONFIGURE_FILE("${infile}" "${out_depends}" COPY_ONLY)
-    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-      COMMAND ${QT_RCC_EXECUTABLE}
-      ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
-      MAIN_DEPENDENCY ${infile}
-      DEPENDS ${_RC_DEPENDS} "${out_depends}" VERBATIM)
-    SET(${outfiles} ${${outfiles}} ${outfile})
-  ENDFOREACH (it)
-
-ENDMACRO (QT5_ADD_RESOURCES)
+macro(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
+    # For Windows, create a parameters file to work around command line length limit
+    if(WIN32)
+        # Pass the parameters in a file.  Set the working directory to
+        # be that containing the parameters file and reference it by
+        # just the file name.  This is necessary because the moc tool on
+        # MinGW builds does not seem to handle spaces in the path to the
+        # file given with the @ syntax.
+        get_filename_component(_moc_outfile_name "${outfile}" NAME)
+        get_filename_component(_moc_outfile_dir "${outfile}" PATH)
+        if(_moc_outfile_dir)
+          set(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
+        endif()
+        set(_moc_parameters_file ${outfile}_parameters)
+        set(_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
+        string(REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
+        file(WRITE ${_moc_parameters_file} "${_moc_parameters}")
+        add_custom_command(OUTPUT ${outfile}
+                           COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters
+                           DEPENDS ${infile}
+                           ${_moc_working_dir}
+                           VERBATIM)
+    else()
+        add_custom_command(OUTPUT ${outfile}
+                           COMMAND ${QT_MOC_EXECUTABLE}
+                           ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
+                           DEPENDS ${infile} VERBATIM)
+    endif()
+endmacro()
+
+
+macro(QT5_GENERATE_MOC infile outfile )
+    # get include dirs and flags
+    qt5_get_moc_flags(moc_flags)
+    get_filename_component(abs_infile ${infile} ABSOLUTE)
+    set(_outfile "${outfile}")
+    if(NOT IS_ABSOLUTE "${outfile}")
+        set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
+    endif()
+    qt5_create_moc_command(${abs_infile} ${_outfile} "${moc_flags}" "")
+    set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
+endmacro()
+
+
+# qt5_wrap_cpp(outfiles inputfile ... )
+
+macro(QT5_WRAP_CPP outfiles )
+    # get include dirs
+    qt5_get_moc_flags(moc_flags)
+
+    set(options)
+    set(oneValueArgs)
+    set(multiValueArgs OPTIONS)
+
+    cmake_parse_arguments(_WRAP_CPP "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    set(moc_files ${_WRAP_CPP_UNPARSED_ARGUMENTS})
+    set(moc_options ${_WRAP_CPP_OPTIONS})
+    foreach(it ${moc_files})
+        get_filename_component(it ${it} ABSOLUTE)
+        qt5_make_output_file(${it} moc_ cxx outfile)
+        qt5_create_moc_command(${it} ${outfile} "${moc_flags}" "${moc_options}")
+        set(${outfiles} ${${outfiles}} ${outfile})
+    endforeach()
+endmacro()
+
+
+# qt5_add_resources(outfiles inputfile ... )
+
+macro(QT5_ADD_RESOURCES outfiles )
+
+    set(options)
+    set(oneValueArgs)
+    set(multiValueArgs OPTIONS)
+
+    cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
+    set(rcc_options ${_RCC_OPTIONS})
+
+    foreach(it ${rcc_files})
+        get_filename_component(outfilename ${it} NAME_WE)
+        get_filename_component(infile ${it} ABSOLUTE)
+        get_filename_component(rc_path ${infile} PATH)
+        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
+        #  parse file for dependencies
+        #  all files are absolute paths or relative to the location of the qrc file
+        file(READ "${infile}" _RC_FILE_CONTENTS)
+        string(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
+        set(_RC_DEPENDS)
+        foreach(_RC_FILE ${_RC_FILES})
+            string(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
+            if(NOT IS_ABSOLUTE "${_RC_FILE}")
+                set(_RC_FILE "${rc_path}/${_RC_FILE}")
+            endif()
+            set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
+        endforeach()
+        # Since this cmake macro is doing the dependency scanning for these files,
+        # let's make a configured file and add it as a dependency so cmake is run
+        # again when dependencies need to be recomputed.
+        qt5_make_output_file("${infile}" "" "qrc.depends" out_depends)
+        configure_file("${infile}" "${out_depends}" COPY_ONLY)
+        add_custom_command(OUTPUT ${outfile}
+                           COMMAND ${QT_RCC_EXECUTABLE}
+                           ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
+                           MAIN_DEPENDENCY ${infile}
+                           DEPENDS ${_RC_DEPENDS} "${out_depends}" VERBATIM)
+        set(${outfiles} ${${outfiles}} ${outfile})
+    endforeach()
+endmacro()