diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-26 09:40:35 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-26 09:43:03 +0200 |
| commit | a1a8cf65b7426d9466f6340cfeb162f2d0787de2 (patch) | |
| tree | 31b1230930cf3ca8cf8c33ae73b5e4e4f57d3b88 /sources/shiboken2 | |
| parent | 3f8c8702ea295f39357e7c66f46e5138f56bcc9f (diff) | |
| parent | e0a8f2dfb759ef4eff542d0a317a9370d4eddc52 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: I0c5b60263ed642a9b6f6b5d6a1492a11f278bfd5
Diffstat (limited to 'sources/shiboken2')
| -rw-r--r-- | sources/shiboken2/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt index 0a2920e4f..60ab7878f 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt @@ -44,8 +44,8 @@ macro(get_llvm_config) import os import sys sys.path.append(os.path.realpath(os.path.join('${CMAKE_CURRENT_LIST_DIR}', '..', '..'))) - from build_scripts.utils import findLlvmConfig - llvmConfig = findLlvmConfig() + from build_scripts.utils import find_llvm_config + llvmConfig = find_llvm_config() if llvmConfig: print(llvmConfig) " |