Revision bump to fix bug #358317.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 253 insertions, 19 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 2469641c935e..3a2c288a9b45 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.163 2011/04/07 18:15:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.164 2011/04/18 10:17:30 scarabeus Exp $
+
+*cmake-2.8.4-r1 (18 Apr 2011)
+
+  18 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -cmake-2.8.3-r1.ebuild,
+  +cmake-2.8.4-r1.ebuild, +files/cmake-2.8.4-FindQt4.patch:
+  Revision bump to fix bug #358317.
 
   07 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.4.ebuild:
   Inherit virtualx.eclass to fix bug #362389
diff --git a/dev-util/cmake/cmake-2.8.3-r1.ebuild b/dev-util/cmake/cmake-2.8.4-r1.ebuild
index e5abc6ed4d66..a978c612459d 100644
--- a/dev-util/cmake/cmake-2.8.3-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.3-r1.ebuild,v 1.4 2011/01/17 23:29:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.4-r1.ebuild,v 1.1 2011/04/18 10:17:30 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
 
 MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
 
@@ -42,21 +42,21 @@ S="${WORKDIR}/${MY_P}"
 
 CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 
+# REDO ME:
+# darwin-no-qt
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
 	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
 	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
 	"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
-	"${FILESDIR}"/${PN}-2.8.0-darwin-no-app-with-qt.patch
-	"${FILESDIR}"/${PN}-2.8.1-FindBoost.patch
 	"${FILESDIR}"/${PN}-2.8.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.3-FindLibArchive.patch
-	"${FILESDIR}"/${PN}-2.8.3-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.3-FindPythonInterp.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindPythonInterp.patch
 	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
 	"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
-	"${FILESDIR}"/${PN}-2.8.3-buffer_overflow.patch
 	"${FILESDIR}"/${PN}-2.8.3-fix_assembler_test.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindQt4.patch
 )
 _src_bootstrap() {
 	  echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
@@ -112,34 +112,43 @@ src_configure() {
 
 src_compile() {
 	cmake-utils_src_compile
-	if use emacs; then
-		elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
-	fi
+	use emacs && elisp-compile Docs/cmake-mode.el
 }
 
-src_test() {
+_run_test() {
 	# fix OutDir test
+	# this is altered thanks to our eclass
 	sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
 	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	"${CMAKE_BUILD_DIR}"/bin/ctest || die "Tests failed"
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
+	#        as it was never intended to be used this way.
+	"${CMAKE_BUILD_DIR}"/bin/ctest \
+		-E BootstrapTest SimpleCOnly_sdcc \
+		|| die "Tests failed"
 	popd > /dev/null
 }
 
+src_test() {
+	VIRTUALX_COMMAND="_run_test" virtualmake
+}
+
 src_install() {
 	cmake-utils_src_install
 	if use emacs; then
-		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed"
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins Docs/cmake-syntax.vim || die
+		doins Docs/cmake-syntax.vim
 
 		insinto /usr/share/vim/vimfiles/indent
-		doins Docs/cmake-indent.vim || die
+		doins Docs/cmake-indent.vim
 
 		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}/${VIMFILE}" || die
+		doins "${FILESDIR}/${VIMFILE}"
 	fi
 }
 
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch b/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch
new file mode 100644
index 000000000000..1e2b99c20f86
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch
@@ -0,0 +1,219 @@
+--- cmake-2.8.4/usr/share/cmake/Modules/FindQt4.cmake.org	2011-03-09 19:08:15.384000064 +0100
++++ cmake-2.8.4/usr/share/cmake/Modules/FindQt4.cmake	2011-03-09 19:09:18.162000065 +0100
+@@ -835,7 +835,7 @@
+               PATHS
+               ${QT_HEADERS_DIR}/${QT_MODULE}
+               ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
+-              NO_DEFAULT_PATH
++              NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+       )
+     # phonon doesn't seem consistent, let's try phonondefs.h for some
+     # installations
+@@ -844,7 +844,7 @@
+                 PATHS
+                 ${QT_HEADERS_DIR}/${QT_MODULE}
+                 ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
+-                NO_DEFAULT_PATH
++                NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+         )
+     ENDIF(${QT_MODULE} STREQUAL "phonon")
+   ENDFOREACH(QT_MODULE)
+@@ -854,11 +854,11 @@
+     # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
+     FIND_PATH(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
+       PATHS ${QT_HEADERS_DIR}/ActiveQt
+-      NO_DEFAULT_PATH
++      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+       )
+     FIND_PATH(QT_QAXSERVER_INCLUDE_DIR ActiveQt
+       PATHS ${QT_HEADERS_DIR}/ActiveQt
+-      NO_DEFAULT_PATH
++      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+       )
+   ENDIF(Q_WS_WIN)
+ 
+@@ -867,7 +867,7 @@
+     PATHS
+     ${QT_HEADERS_DIR}/QtDesigner
+     ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+   
+   # Set QT_QTASSISTANT_INCLUDE_DIR
+@@ -875,7 +875,7 @@
+     PATHS
+     ${QT_HEADERS_DIR}/QtAssistant
+     ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+   
+   # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
+@@ -883,7 +883,7 @@
+     PATHS
+     ${QT_HEADERS_DIR}/QtAssistant
+     ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   ########################################
+@@ -897,11 +897,11 @@
+     STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
+     FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE 
+                  NAMES ${QT_MODULE}${QT_LIBINFIX} ${QT_MODULE}${QT_LIBINFIX}4
+-                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
++                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+         )
+     FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG 
+                  NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4
+-                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
++                 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+         )
+   ENDFOREACH(QT_MODULE)
+ 
+@@ -911,26 +911,26 @@
+   ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
+ 
+   # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
+-  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG   NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG   NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+   # Set QT_QTMAIN_LIBRARY
+   IF(Q_WS_WIN)
+-    FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++    FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+   ENDIF(Q_WS_WIN)
+   
+   # Set QT_QTASSISTANTCLIENT_LIBRARY
+-  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR}  NO_DEFAULT_PATH)
++  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++  FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR}  NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+   
+   # Set QT_QTASSISTANT_LIBRARY
+-  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG   NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+   # Set QT_QTHELP_LIBRARY
+-  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG   NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++  FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG   NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+   IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
+     FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR})
+   ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
+@@ -993,67 +993,67 @@
+   FIND_PROGRAM(QT_MOC_EXECUTABLE
+     NAMES moc-qt4 moc
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_UIC_EXECUTABLE
+     NAMES uic-qt4 uic
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_UIC3_EXECUTABLE
+     NAMES uic3
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_RCC_EXECUTABLE 
+     NAMES rcc
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE 
+     NAMES qdbuscpp2xml
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE 
+     NAMES qdbusxml2cpp
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
+     NAMES lupdate-qt4 lupdate
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
+     NAMES lrelease-qt4 lrelease
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
+     NAMES qcollectiongenerator-qt4 qcollectiongenerator
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
+     NAMES designer-qt4 designer
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
+     NAMES linguist-qt4 linguist
+     PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
++    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+     )
+ 
+   IF (QT_MOC_EXECUTABLE)
+@@ -1158,11 +1158,11 @@
+       IF(QT_IS_STATIC)
+         FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_RELEASE
+                      NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
+-                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
++                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+             )
+         FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_DEBUG
+                      NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
+-                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
++                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+             )
+         _QT4_ADJUST_LIB_VARS(${QT_PLUGIN})
+       ELSE(QT_IS_STATIC)
+@@ -1171,11 +1171,11 @@
+         SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_MODULE_SUFFIX} ${CMAKE_SHARED_LIBRARY_SUFFIX})
+         FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_RELEASE
+                      NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4
+-                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
++                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+             )
+         FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_DEBUG
+                      NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4
+-                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH
++                     PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+             )
+         MARK_AS_ADVANCED(QT_${_upper_qt_plugin}_PLUGIN_RELEASE QT_${_upper_qt_plugin}_PLUGIN_DEBUG)
+         SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_DEFAULT})