diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-03-05 23:45:25 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-08 01:25:38 +0100 |
| commit | a222ed8e876f442b0a45275643b5d210a914f269 (patch) | |
| tree | a8f6d19a6e30ce510a527e92f4351e6c5010ad5d /src/linguist/linguist.pro | |
| parent | 1286ff6b6dbd7f97e1b4901c79f7bae41e4b4f47 (diff) | |
| download | qttools-a222ed8e876f442b0a45275643b5d210a914f269.tar.gz | |
Generate the correct paths for libs and bins in the cmake files.
Change-Id: I33f5de28c4adad8b9822f74675d53fd6f63ef527
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/linguist/linguist.pro')
| -rw-r--r-- | src/linguist/linguist.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro index a45fdc1b0..989de75bb 100644 --- a/src/linguist/linguist.pro +++ b/src/linguist/linguist.pro @@ -10,7 +10,7 @@ win32:CMAKE_BIN_SUFFIX = ".exe" CMAKE_QT_INSTALL_PREFIX_ESCAPED = "^$$re_escape($$[QT_INSTALL_PREFIX])/" win32:CMAKE_QT_INSTALL_PREFIX_ESCAPED ~= s,\\\\,/ -CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS] +CMAKE_LIB_DIR = $$replace($$list($$[QT_INSTALL_LIBS]), \\\\, /)/ contains(CMAKE_LIB_DIR, "$${CMAKE_QT_INSTALL_PREFIX_ESCAPED}.*") { CMAKE_LIB_DIR = $$replace(CMAKE_LIB_DIR, "$$CMAKE_QT_INSTALL_PREFIX_ESCAPED", ) CMAKE_RELATIVE_INSTALL_DIR = $$replace(CMAKE_LIB_DIR, "[^/]+", ..) @@ -19,7 +19,7 @@ contains(CMAKE_LIB_DIR, "$${CMAKE_QT_INSTALL_PREFIX_ESCAPED}.*") { CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_DIR}/../../" } -CMAKE_BIN_DIR = $$[QT_INSTALL_BINS] +CMAKE_BIN_DIR = $$replace($$list($$[QT_INSTALL_BINS]), \\\\, /)/ contains(CMAKE_BIN_DIR, "$${CMAKE_QT_INSTALL_PREFIX_ESCAPED}.*") { CMAKE_BIN_DIR = $$replace(CMAKE_BIN_DIR, "$$CMAKE_QT_INSTALL_PREFIX_ESCAPED", ) } else { |