[Bf-blender-cvs] [257268a] master: CMake: check for LLVM static library by default
Campbell Barton
noreply at git.blender.org
Tue Jan 19 02:45:44 CET 2016
Commit: 257268a1bd66543eb2420b4ad3be96ba0cf74554
Author: Campbell Barton
Date: Tue Jan 19 12:37:26 2016 +1100
Branches: master
https://developer.blender.org/rB257268a1bd66543eb2420b4ad3be96ba0cf74554
CMake: check for LLVM static library by default
Even when static option isn't enabled, use the static library path if the dynamic library isn't found.
===================================================================
M build_files/cmake/Modules/FindLLVM.cmake
===================================================================
diff --git a/build_files/cmake/Modules/FindLLVM.cmake b/build_files/cmake/Modules/FindLLVM.cmake
index 43791c8..f5f3db3 100644
--- a/build_files/cmake/Modules/FindLLVM.cmake
+++ b/build_files/cmake/Modules/FindLLVM.cmake
@@ -64,7 +64,9 @@ if(LLVM_STATIC)
PATHS ${LLVM_LIBPATH})
else()
find_library(LLVM_LIBRARY
- NAMES LLVM-${LLVM_VERSION}
+ NAMES
+ LLVM-${LLVM_VERSION}
+ LLVMAnalysis # check for the static library as a fall-back
PATHS ${LLVM_LIBPATH})
endif()
More information about the Bf-blender-cvs
mailing list