diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2019-12-04 11:26:57 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2019-12-12 09:59:36 +0100 |
| commit | 1c2d9d4b8deb8396664f3b73c179a214a4d1a9d4 (patch) | |
| tree | 392dcc96da3f28f9cf09136505b0b5ff20ae38ba /src/global | |
| parent | fe3ead8597d90f87d40a149f779053e7de414704 (diff) | |
| download | qttools-1c2d9d4b8deb8396664f3b73c179a214a4d1a9d4.tar.gz | |
Fix compiling lupdate with clang|llvm
* llvm compiled from source uses now git prefix instead of svn
* on macOS Catalina terminfo cannot be found, try libcurses instead
Change-Id: Iaabad8ca4900599cf015cfaf0f64339378f1dcd1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Diffstat (limited to 'src/global')
| -rw-r--r-- | src/global/configure.pri | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/global/configure.pri b/src/global/configure.pri index 7072ae0b1..2d0601245 100644 --- a/src/global/configure.pri +++ b/src/global/configure.pri @@ -1,7 +1,7 @@ -defineReplace(extractVersion) { return($$replace(1, ^(\\d+\\.\\d+\\.\\d+)(svn)?$, \\1)) } -defineReplace(extractMajorVersion) { return($$replace(1, ^(\\d+)\\.\\d+\\.\\d+(svn)?$, \\1)) } -defineReplace(extractMinorVersion) { return($$replace(1, ^\\d+\\.(\\d+)\\.\\d+(svn)?$, \\1)) } -defineReplace(extractPatchVersion) { return($$replace(1, ^\\d+\\.\\d+\\.(\\d+)(svn)?$, \\1)) } +defineReplace(extractVersion) { return($$replace(1, ^(\\d+\\.\\d+\\.\\d+)(svn|git)?$, \\1)) } +defineReplace(extractMajorVersion) { return($$replace(1, ^(\\d+)\\.\\d+\\.\\d+(svn|git)?$, \\1)) } +defineReplace(extractMinorVersion) { return($$replace(1, ^\\d+\\.(\\d+)\\.\\d+(svn|git)?$, \\1)) } +defineReplace(extractPatchVersion) { return($$replace(1, ^\\d+\\.\\d+\\.(\\d+)(svn|git)?$, \\1)) } defineTest(versionIsAtLeast) { actual_major_version = $$extractMajorVersion($$1) @@ -190,8 +190,10 @@ defineReplace(CheckClangLlvmLibForLupdateParser) { return($$CLANG_LLVM_LIBS) } } - !equals(QMAKE_HOST.os, Windows): \ - CLANG_LLVM_LIBS += -lz -ltinfo + !equals(QMAKE_HOST.os, Windows): { + equals(QMAKE_HOST.os, Darwin): CLANG_LLVM_LIBS += -lz -lcurses + else: CLANG_LLVM_LIBS += -lz -ltinfo + } return($$CLANG_LLVM_LIBS) } |