X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=cmake%2FModules%2FFindLLVM.cmake;h=1b8303f3d79f647879b77d5d78c75db3aa78ed31;hb=217321b48c503edd5b35f35158ba68a04d81ecd3;hp=ba2dd1521ba9eecfe5ac25b466b15933574cd162;hpb=f44ed1e33c85254a6176b1db3775b9b13baaaa29;p=frida%2Ffrida.git

diff --git a/cmake/Modules/FindLLVM.cmake b/cmake/Modules/FindLLVM.cmake
index ba2dd15..1b8303f 100644
--- a/cmake/Modules/FindLLVM.cmake
+++ b/cmake/Modules/FindLLVM.cmake
@@ -1,10 +1,10 @@
-find_program(LLVM_CONFIG NAMES llvm-config-3.5 llvm-config)
+find_program(LLVM_CONFIG NAMES llvm-config-3.5 llvm-config35 llvm-config llvm-config-3.6 llvm-config36)
 
 if(LLVM_CONFIG)
   execute_process(COMMAND ${LLVM_CONFIG} --version
 	OUTPUT_VARIABLE LLVM_VERSION)
 
-  if(((${LLVM_VERSION} VERSION_LESS 3.6.0)
+  if(((${LLVM_VERSION} VERSION_LESS 3.7.0)
 		AND (${LLVM_VERSION} VERSION_GREATER 3.5))
 	  OR (${LLVM_VERSION} VERSION_EQUAL 3.5))
 
@@ -24,6 +24,14 @@ if(LLVM_CONFIG)
 	string(REPLACE -I "-isystem" LLVM_CFLAGS ${LLVM_CFLAGS})
 
 	separate_arguments(LLVM_CFLAGS)
+
+	if(${LLVM_VERSION} VERSION_LESS 3.6)
+	  set(LLVM_CFLAGS ${LLVM_CFLAGS} -DLLVM_35)
+	  set(LLVM_DYNAMIC_LIB -lLLVM-3.5)
+	else()
+	  set(LLVM_CFLAGS ${LLVM_CFLAGS} -DLLVM_36)
+	  set(LLVM_DYNAMIC_LIB -lLLVM-3.6)
+	endif()
   endif()
 endif()