94d2e57c62
before it didn't. Through this commit I expect the build farm to try to build kde, and see whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook. svn path=/nixpkgs/trunk/; revision=15838
14 lines
537 B
Diff
14 lines
537 B
Diff
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
|
|
index 3bb77d1..7fdbe4a 100644
|
|
--- a/Modules/FindQt4.cmake
|
|
+++ b/Modules/FindQt4.cmake
|
|
@@ -579,6 +579,8 @@ IF (QT4_QMAKE_FOUND)
|
|
FOREACH(QT_MODULE ${QT_MODULES})
|
|
STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
|
|
FIND_PATH(QT_${_upper_qt_module}_INCLUDE_DIR ${QT_MODULE}
|
|
+ NO_CMAKE_PATH
|
|
+ NO_CMAKE_ENVIRONMENT_PATH
|
|
PATHS
|
|
${QT_HEADERS_DIR}/${QT_MODULE}
|
|
${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
|