diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-12-09 13:17:06 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-12-10 12:53:46 +0000 |
| commit | 0936765801ec9ad4710e94ea788515e498315bd7 (patch) | |
| tree | b042a66e181d95435f20bc725622f909ee60df1f /cmake | |
| parent | 86c2949b41dc7dde2ac6538c7fa04db4343601d4 (diff) | |
Post merge fixes
Change-Id: I8433ce831360d82263ea7b3ecb7ec13b6d8d0f0a
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindWrapLibClang.cmake | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/cmake/FindWrapLibClang.cmake b/cmake/FindWrapLibClang.cmake index 9ad0202b2..0155f0cdb 100644 --- a/cmake/FindWrapLibClang.cmake +++ b/cmake/FindWrapLibClang.cmake @@ -18,6 +18,11 @@ function(qt_tools_find_llvm_version_from_lib_dir lib_dir out_var) endfunction() function(qt_tools_find_lib_clang) + if(TARGET WrapLibClang::WrapLibClang) + set(WrapLibClang_FOUND TRUE PARENT_SCOPE) + return() + endif() + if(NOT QDOC_USE_STATIC_LIBCLANG AND DEFINED ENV{QDOC_USE_STATIC_LIBCLANG}) set(QDOC_USE_STATIC_LIBCLANG "$ENV{QDOC_USE_STATIC_LIBCLANG}") endif() @@ -206,6 +211,16 @@ function(qt_tools_find_lib_clang) endif() # QDOC_USE_STATIC_LIBCLANG qt_tools_create_lib_clang_target() + + # Break apart version string + string(REPLACE "." ";" version_list ${QT_LIB_CLANG_VERSION}) + list(GET version_list 0 QT_LIB_CLANG_VERSION_MAJOR) + list(GET version_list 1 QT_LIB_CLANG_VERSION_MINOR) + list(GET version_list 2 QT_LIB_CLANG_VERSION_PATCH) + + set(QT_LIB_CLANG_VERSION_MAJOR ${QT_LIB_CLANG_VERSION_MAJOR} CACHE STRING "" FORCE) + set(QT_LIB_CLANG_VERSION_MINOR ${QT_LIB_CLANG_VERSION_MINOR} CACHE STRING "" FORCE) + set(QT_LIB_CLANG_VERSION_PATCH ${QT_LIB_CLANG_VERSION_PATCH} CACHE STRING "" FORCE) set(QT_LIB_CLANG_LIBS "${QT_LIB_CLANG_LIBS}" CACHE STRING "" FORCE) set(QT_LIB_CLANG_LIBDIR "${QT_LIB_CLANG_LIBDIR}" CACHE STRING "" FORCE) set(QT_LIB_CLANG_INCLUDEPATH "${QT_LIB_CLANG_INCLUDEPATH}" CACHE STRING "" FORCE) |