[Bf-blender-cvs] [ea6992d0e5c] master: Fix missing LLVM include directories on macOS

Brecht Van Lommel noreply at git.blender.org
Sat Sep 7 18:12:56 CEST 2019


Commit: ea6992d0e5cbde4a2fbf62bf76fd6d6b698b91eb
Author: Brecht Van Lommel
Date:   Sat Sep 7 18:08:33 2019 +0200
Branches: master
https://developer.blender.org/rBea6992d0e5cbde4a2fbf62bf76fd6d6b698b91eb

Fix missing LLVM include directories on macOS

These are not used in master yet, but they are needed for the functions branch.

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

M	build_files/cmake/platform/platform_apple.cmake

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

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index e79359e9f3b..249546dd216 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -322,7 +322,6 @@ endif()
 
 if(WITH_LLVM)
   set(LLVM_ROOT_DIR ${LIBDIR}/llvm)
-  set(LLVM_VERSION 3.4)
   if(EXISTS "${LLVM_ROOT_DIR}/bin/llvm-config")
     set(LLVM_CONFIG "${LLVM_ROOT_DIR}/bin/llvm-config")
   else()
@@ -334,6 +333,9 @@ if(WITH_LLVM)
   execute_process(COMMAND ${LLVM_CONFIG} --prefix
       OUTPUT_VARIABLE LLVM_ROOT_DIR
       OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(COMMAND ${LLVM_CONFIG} --includedir
+      OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
   execute_process(COMMAND ${LLVM_CONFIG} --libdir
       OUTPUT_VARIABLE LLVM_LIBPATH
       OUTPUT_STRIP_TRAILING_WHITESPACE)



More information about the Bf-blender-cvs mailing list