Ticket #28520: patch-Modules-FindQt4.cmake-NEW.diff

File patch-Modules-FindQt4.cmake-NEW.diff, 2.3 KB (added by Ionic (Mihai Moldovan), 14 years ago)

Updated Modules file, no more fuzzy patching.

  • Modules/FindQt4.cmake

    diff -ur cmake-2.8.4-orig/Modules/FindQt4.cmake cmake-2.8.4/Modules/FindQt4.cmake
     
    583583    SET(QT_MKSPECS_DIR NOTFOUND)
    584584    FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri
    585585      HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
    586       DOC "The location of the Qt mkspecs containing qconfig.pri")
     586      DOC "The location of the Qt mkspecs containing qconfig.pri"
     587      NO_DEFAULT_PATH)
    587588  ENDIF()
    588589
    589590  IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
     
    607608    FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE
    608609                 NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4
    609610                 HINTS ${QT_LIBRARY_DIR_TMP}
    610                  NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
     611                 NO_DEFAULT_PATH
    611612        )
    612613    FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG
    613614                 NAMES QtCore${QT_LIBINFIX}_debug QtCore${QT_LIBINFIX}d QtCore${QT_LIBINFIX}d4
    614615                 HINTS ${QT_LIBRARY_DIR_TMP}
    615                  NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
     616                 NO_DEFAULT_PATH
    616617        )
    617618
    618619    # try dropping a hint if trying to use Visual Studio with Qt built by mingw
     
    666667                HINTS ${qt_headers}
    667668                ${QT_LIBRARY_DIR}/QtCore.framework/Headers
    668669                PATH_SUFFIXES QtCore
     670                NO_DEFAULT_PATH
    669671        )
    670672
    671673      # Set QT_HEADERS_DIR based on finding QtCore header
     
    714716    endforeach(qt_cross_path)
    715717    FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
    716718      HINTS ${qt_cross_paths} ${qt_plugins_dir}
    717       DOC "The location of the Qt plugins")
     719      DOC "The location of the Qt plugins"
     720      NO_DEFAULT_PATH)
    718721  ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)
    719722
    720723  # ask qmake for the translations directory
     
    734737      FIND_PATH(QT_IMPORTS_DIR NAMES Qt
    735738        HINTS ${qt_cross_paths} ${qt_imports_dir}
    736739        DOC "The location of the Qt imports"
    737         NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
    738         NO_CMAKE_SYSTEM_PATH)
     740        NO_DEFAULT_PATH)
    739741      mark_as_advanced(QT_IMPORTS_DIR)
    740742    endif(qt_imports_dir)
    741743  ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR  OR  QT_QMAKE_CHANGED)