f564508406
kdeaccessibility4 and kdeutils4 are now meta ports. deskutils/kdepim4 updated to match KDE SC version, old kdepim preserved in deskutils/kdepim44. Follow UPDATING instruction! New ports: - accessibility/kaccessible - accessibility/kmag - accessibility/kmousetool - accessibility/kmouth - archivers/ark - comms/kremotecontrol - deskutils/kcharselect - deskutils/kdepim44 - deskutils/kdepim44-runtime - deskutils/superkaramba - devel/kdebindings4-perl-perlkde - devel/kdebindings4-perl-perlqt - math/analitza - math/kcalc - misc/kde4-l10n-fa - security/kgpg-kde4 - security/kwallet - sysutils/kdf - sysutils/kfloppy - sysutils/sweeper - vietnamese/kde4-l10n - x11-clocks/ktimer - x11/kactivities - x11/libkonq Removed ports: - devel/kdebindings4-kross-interpreters - devel/kdebindings4-python - devel/kdebindings4-ruby - devel/kdebindings4-smoke
28 lines
1.3 KiB
CMake
28 lines
1.3 KiB
CMake
--- ./cmake/modules/FindQt4.cmake.orig 2011-07-28 05:34:31.000000000 +1100
|
|
+++ ./cmake/modules/FindQt4.cmake 2012-05-18 00:28:12.000000000 +1100
|
|
@@ -627,23 +627,12 @@
|
|
# ask qmake for the imports directory
|
|
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)
|
|
- mark_as_advanced(QT_IMPORTS_DIR)
|
|
- endif(qt_imports_dir)
|
|
+ SET(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports" FORCE)
|
|
ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
|
|
|
|
# Make variables changeble to the advanced user
|
|
MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_DOC_DIR QT_MKSPECS_DIR
|
|
- QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
|
|
+ QT_PLUGINS_DIR QT_TRANSLATIONS_DIR QT_IMPORTS_DIR)
|
|
|
|
|
|
#############################################
|