mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 03:30:32 -04:00
3ceed87743
It includes an upstream patch which fixes the FindPkgConfig.cmake module. It will be part of 2.8.9. PR: ports/167140 Approved by: portmgr (pav via exp-run)
43 lines
2.2 KiB
CMake
43 lines
2.2 KiB
CMake
--- ./Modules/FindQt4.cmake.orig 2011-12-30 17:49:56.000000000 +0100
|
|
+++ ./Modules/FindQt4.cmake 2012-04-07 18:45:53.442654169 +0200
|
|
@@ -473,7 +473,7 @@
|
|
# check for qmake
|
|
# Debian uses qmake-qt4
|
|
# macports' Qt uses qmake-mac
|
|
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
|
|
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake qmake4 qmake-mac PATHS
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
|
|
@@ -665,13 +665,7 @@
|
|
# ask qmake for the plugins directory
|
|
IF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED)
|
|
_qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir)
|
|
- SET(QT_PLUGINS_DIR NOTFOUND)
|
|
- foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
|
|
- set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins")
|
|
- endforeach(qt_cross_path)
|
|
- FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
|
|
- HINTS ${qt_cross_paths} ${qt_plugins_dir}
|
|
- DOC "The location of the Qt plugins")
|
|
+ SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
|
|
ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED)
|
|
|
|
# ask qmake for the translations directory
|
|
@@ -684,15 +678,7 @@
|
|
IF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
|
|
_qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
|
|
if(qt_imports_dir)
|
|
- SET(QT_IMPORTS_DIR NOTFOUND)
|
|
- foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
|
|
- set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports")
|
|
- endforeach(qt_cross_path)
|
|
- FIND_PATH(QT_IMPORTS_DIR NAMES Qt
|
|
- HINTS ${qt_cross_paths} ${qt_imports_dir}
|
|
- DOC "The location of the Qt imports"
|
|
- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
|
|
- NO_CMAKE_SYSTEM_PATH)
|
|
+ SET(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports" FORCE)
|
|
mark_as_advanced(QT_IMPORTS_DIR)
|
|
endif(qt_imports_dir)
|
|
ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
|