projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d87edf4
)
Fix the include dir used by the CMake config files.
author
Stephen Kelly
<stephen.kelly@kdab.com>
Wed, 29 Feb 2012 16:00:04 +0000
(17:00 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Wed, 29 Feb 2012 16:43:00 +0000
(17:43 +0100)
I missed this one in
018e78575c6f7f5a90b41274468a26b09b909443
Change-Id: I194b96d2b1a64025ddb17fe2ed81566838555e13
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
mkspecs/features/create_cmake.prf
patch
|
blob
|
history
diff --git
a/mkspecs/features/create_cmake.prf
b/mkspecs/features/create_cmake.prf
index
1aa8ae5
..
6a8045a
100644
(file)
--- a/
mkspecs/features/create_cmake.prf
+++ b/
mkspecs/features/create_cmake.prf
@@
-24,7
+24,7
@@
CMAKE_PARTIAL_MODULE_DEPS = $$replace(CMAKE_MODULE_DEPS, ";", ";Qt5::")
CMAKE_QT_INSTALL_PREFIX = $$replace($$list($$[QT_INSTALL_PREFIX]), \\\\, /)/
CMAKE_QT_INSTALL_PREFIX_ESCAPED = "^$$re_escape($$CMAKE_QT_INSTALL_PREFIX)"
-CMAKE_INCLUDE_DIR = $$
[QT_INSTALL_HEADERS]
+CMAKE_INCLUDE_DIR = $$
replace($$list($$[QT_INSTALL_HEADERS]), \\\\, /)/
contains(CMAKE_INCLUDE_DIR, "$${CMAKE_QT_INSTALL_PREFIX_ESCAPED}.*") {
CMAKE_INCLUDE_DIR = $$replace(CMAKE_INCLUDE_DIR, "$$CMAKE_QT_INSTALL_PREFIX_ESCAPED", )
} else {