[Bf-blender-cvs] [8b0c9e4331b] functions: don't hardcode llvm include dirs

[Jacques Lucke]

Commit: 8b0c9e4331b32e8ce88607690541893fe1f8bc1a
Author: Jacques Lucke
Date:   Wed Mar 6 11:23:04 2019 +0100
Branches: functions
https://developer.blender.org/rB8b0c9e4331b32e8ce88607690541893fe1f8bc1a

don't hardcode llvm include dirs

===================================================================

M	build_files/cmake/Modules/FindLLVM.cmake
M	source/blender/functions/CMakeLists.txt

===================================================================

diff --git a/build_files/cmake/Modules/FindLLVM.cmake b/build_files/cmake/Modules/FindLLVM.cmake
index a40a71cb58e..64ba2a70a26 100644
--- a/build_files/cmake/Modules/FindLLVM.cmake
+++ b/build_files/cmake/Modules/FindLLVM.cmake
@@ -49,6 +49,7 @@ if(NOT LLVM_ROOT_DIR)
 					OUTPUT_VARIABLE LLVM_ROOT_DIR
 					OUTPUT_STRIP_TRAILING_WHITESPACE)
 	set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation")
+	set(LLVM_INCLUDE_DIRS ${LLVM_ROOT_DIR}/include CACHE PATH "Path to the LLVM include directory")
 endif()
 if(NOT LLVM_LIBPATH)
 	execute_process(COMMAND ${LLVM_CONFIG} --libdir
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 76c8a8dbf78..4a833c0d3ac 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -7,9 +7,7 @@ set(INC
 	../depsgraph
 )
 
-# TODO: figure out how not to hard code this
 set(INC_SYS
-	/usr/lib/llvm-6.0/include
 	${LLVM_INCLUDE_DIRS}
 )