Differential D15895 Diff 42730 cmake/modules/FindClang.cmake

Changeset View

Standalone View

View Options

cmake/modules/FindClang.cmake

Context not available.
89 89​
90if(CLANG_FOUND) 90​if(CLANG_FOUND)
91 set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS}) 91​ set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
92 set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) ​
kfunkUnsubmitted
Not Done

IIUC then CLANG_INCLUDE_DIRS shouldn't be touched. CLANG_INCLUDE_DIRS is for finding the correct include dirs for building KDevClangSupport against libclang -- we don't need to have things like compiler builtin includes in there.

Rather, leave CLANG_INCLUDE_DIRS as it is and do find_path(CLANG_BUILTIN_DIR ...), in other words: create another variable.

@buschinski Just to double-check: /usr/lib64/llvm/7/include has a clang subfolder on Gentoo, right?

kfunk: IIUC then `CLANG_INCLUDE_DIRS` shouldn't be touched. `CLANG_INCLUDE_DIRS` is for finding the…
buschinskiAuthorUnsubmitted
Not Done

Yes, there is a /usr/lib64/llvm/7/include/clang, but it does not contain cpuid.h or such headers.

And just to be clear, the original version looked for
"/usr/lib64/llvm/7/lib64/clang/7.0.0/include", which does not exist.

$ llvm-config --libdir
/usr/lib64/llvm/7/lib64
the double "lib64" sounds wrong, but it is correct, exists and does also contains lots of libclang*.

I will change it to CLANG_BUILTIN_DIR and revert the CLANG_INCLUDE_DIRS changes.

buschinski: Yes, there is a /usr/lib64/llvm/7/include/clang, but it does not contain cpuid.h or such…
93 set(CLANG_VERSION ${LLVM_VERSION}) 92​ set(CLANG_VERSION ${LLVM_VERSION})
94 93​
94​ find_path(CLANG_INCLUDE_DIRS
95​ NAMES "cpuid.h"
kossebauUnsubmitted
Not Done

I would like some comment why "cpuid.h" and some cross-linking between ClangSupport constructor and this.
Unless cpuid.h is a header well known for such compiler/system includes testing, and I yet have to learn much more :)

kossebau: I would like some comment why "cpuid.h" and some cross-linking between ClangSupport constructor…
buschinskiAuthorUnsubmitted
Not Done

"cpuid.h" is common (as far as I know) for compiler (gcc/clang), but not very clang specific. I will add a comment regarding ClangSupport constructor

buschinski: "cpuid.h" is common (as far as I know) for compiler (gcc/clang), but not very clang specific. I…
96​ HINTS "clang"
97​ PATHS "${LLVM_INCLUDE_DIRS}/clang/${CLANG_VERSION}/include"
98​ "${LLVM_INCLUDE_DIRS}/../../../clang/${CLANG_VERSION}/include"
99​ )
100​
101​ if (NOT CLANG_INCLUDE_DIRS)
102​ message(FATAL_ERROR "Could not find: CLANG_INCLUDE_DIRS!")
103​ endif()
kfunkUnsubmitted
Not Done

Needs NO_DEFAULT_PATH otherwise include dirs from e.g. /usr/include may take precedence.

This is important if you (for instance) have a self-built version of LLVM/Clang in $HOME, and a distro-provided version in /usr, with the exact same version.

Your patch as-is returns:

/usr/include/clang/6.0.1/include

... while it should return this for me:

/home/kfunk/devel/build/llvm/lib/clang/6.0.1/include

Adding NO_DEFAULT_PATH fixes the issue for me.

kfunk: Needs `NO_DEFAULT_PATH` otherwise include dirs from e.g. /usr/include may take precedence.
104​
kfunkUnsubmitted
Not Done

Typo: "Unabled"

kfunk: Typo: "Unabled"
buschinskiAuthorUnsubmitted
Not Done

rephrased to match other error messages to:
"Could not find Clang builtin directory"

buschinski: rephrased to match other error messages to: "Could not find Clang builtin directory"
95 # check whether llvm-config comes from an install prefix 105​ # check whether llvm-config comes from an install prefix
96 execute_process( 106​ execute_process(
97 COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root 107​ COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
Context not available.