summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2013-06-07 13:22:51 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-10 23:29:40 +0200
commite1109df7a92812233935489bc9fbae524536130a (patch)
tree0764fbf2b8654a495b2fe3c6f15267e20c7255c5 /mkspecs/features
parentd7b79ff3ef714ca0c433763a0563a069575271cb (diff)
Remove the use of CMAKE_FIND_ROOT_PATH.
This is actually a list in CMake, not a value to be prepended to paths. Specify the QT_SYSROOT instead to root the location of include directories. CMake will soon get a CMAKE_SYSROOT variable which will replace this. Change-Id: I239f69f127f3676a3835aa4f29638f44ef209819 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/cmake_functions.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/cmake_functions.prf b/mkspecs/features/cmake_functions.prf
index f48ef43b88..a67fd9af9b 100644
--- a/mkspecs/features/cmake_functions.prf
+++ b/mkspecs/features/cmake_functions.prf
@@ -45,7 +45,7 @@ defineReplace(cmakePortablePaths) {
variable = $$1
out =
for(v, variable) {
- out += ${CMAKE_FIND_ROOT_PATH}$$cmakeTargetPath($$v)
+ out += $$[QT_SYSROOT]$$cmakeTargetPath($$v)
}
return ($$join(out, ";"))
}