[Bf-blender-cvs] [2213234715f] functions: Merge 'master' into 'functions'

[Jacques Lucke]

Commit: 2213234715fc2877fa538f9f4be0e554b3eaffdf
Author: Jacques Lucke
Date:   Wed Apr 17 10:28:33 2019 +0200
Branches: functions
https://developer.blender.org/rB2213234715fc2877fa538f9f4be0e554b3eaffdf

Merge 'master' into 'functions'

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



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

diff --cc build_files/cmake/Modules/FindLLVM.cmake
index 64ba2a70a26,141a91c0508..1648fb29474
--- a/build_files/cmake/Modules/FindLLVM.cmake
+++ b/build_files/cmake/Modules/FindLLVM.cmake
@@@ -39,24 -39,23 +39,23 @@@ else(
  endif()
  
  if(NOT DEFINED LLVM_VERSION)
- 	execute_process(COMMAND ${LLVM_CONFIG} --version
- 					OUTPUT_VARIABLE LLVM_VERSION
- 					OUTPUT_STRIP_TRAILING_WHITESPACE)
- 	set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
+   execute_process(COMMAND ${LLVM_CONFIG} --version
+           OUTPUT_VARIABLE LLVM_VERSION
+           OUTPUT_STRIP_TRAILING_WHITESPACE)
+   set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
  endif()
  if(NOT LLVM_ROOT_DIR)
- 	execute_process(COMMAND ${LLVM_CONFIG} --prefix
- 					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")
 -  execute_process(COMMAND ${LLVM_CONFIG} --prefix
 -          OUTPUT_VARIABLE LLVM_ROOT_DIR
 -          OUTPUT_STRIP_TRAILING_WHITESPACE)
 -  set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation")
++execute_process(COMMAND ${LLVM_CONFIG} --prefix
++        OUTPUT_VARIABLE LLVM_ROOT_DIR
++        OUTPUT_STRIP_TRAILING_WHITESPACE)
++set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation")
  endif()
  if(NOT LLVM_LIBPATH)
- 	execute_process(COMMAND ${LLVM_CONFIG} --libdir
- 					OUTPUT_VARIABLE LLVM_LIBPATH
- 					OUTPUT_STRIP_TRAILING_WHITESPACE)
- 	set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
- 	mark_as_advanced(LLVM_LIBPATH)
+   execute_process(COMMAND ${LLVM_CONFIG} --libdir
+           OUTPUT_VARIABLE LLVM_LIBPATH
+           OUTPUT_STRIP_TRAILING_WHITESPACE)
+   set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+   mark_as_advanced(LLVM_LIBPATH)
  endif()
  
  if(LLVM_STATIC)