diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-28 08:41:32 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-28 08:41:56 +0200 |
| commit | 7beb2809397bd49809a3e4032195f93315d8422e (patch) | |
| tree | 16648ddc23bd1f09249b81a1adddb42ea1c97d4e /sources/shiboken2 | |
| parent | dd1c55f648cd0d74e926f24b1067f0a345bff8cb (diff) | |
| parent | a1a8cf65b7426d9466f6340cfeb162f2d0787de2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I705ce29f87ca2427077a4f063610be4384d25cee
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) " |