mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-13 12:01:19 +02:00
37 lines
1.6 KiB
CMake
37 lines
1.6 KiB
CMake
--- Modules/FindQt4.cmake.orig 2014-07-27 16:08:51.000000000 +0300
|
|
+++ Modules/FindQt4.cmake 2014-07-27 16:10:01.000000000 +0300
|
|
@@ -701,14 +701,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()
|
|
- 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"
|
|
- NO_CMAKE_FIND_ROOT_PATH)
|
|
+ set(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
|
|
endif ()
|
|
|
|
# ask qmake for the translations directory
|
|
@@ -721,16 +714,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()
|
|
- find_path(QT_IMPORTS_DIR NAMES Qt
|
|
- HINTS ${qt_cross_paths} ${qt_imports_dir}
|
|
- DOC "The location of the Qt imports"
|
|
- NO_CMAKE_FIND_ROOT_PATH
|
|
- 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()
|
|
endif ()
|