Merge pull request #130 from yashtazor/develop

viferga · web-flow · commit d205069c1763 · 2021-05-04T15:18:53.000-07:00
Specified LLVM version and C++ standard
diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
diff --git a/source/loaders/llvm_loader/CMakeLists.txt b/source/loaders/llvm_loader/CMakeLists.txt
@@ -7,9 +7,7 @@ endif()
 # External dependencies
 #
 
-# TODO: Find here how to specify that we only support version 11
-# https://llvm.org/docs/CMake.html#embedding-llvm-in-your-project
-find_package(LLVM REQUIRED)
+find_package(LLVM 11.0.1 REQUIRED)
 
 #
 # Plugin name and options
@@ -118,6 +116,9 @@ set_target_properties(${target}
 	BUNDLE $<$<BOOL:${APPLE}>:$<$<VERSION_GREATER:${PROJECT_OS_VERSION},8>>>
 )
 
+# Setting C++ 17 Standard.
+set_property(TARGET ${target} PROPERTY CXX_STANDARD 17)
+
 #
 # Include directories
 #
diff --git a/source/loaders/llvm_loader/source/llvm_loader_impl.cpp b/source/loaders/llvm_loader/source/llvm_loader_impl.cpp
@@ -20,7 +20,9 @@
 
 #include <llvm_loader/llvm_loader_impl.h>
 
+#include <loader/loader.h>
 #include <loader/loader_impl.h>
+#include <loader/loader_path.h>
 
 #include <reflect/reflect_context.h>
 #include <reflect/reflect_function.h>
@@ -43,7 +45,7 @@
 #include <llvm/Support/TargetSelect.h>
 
 // Optimizations
-#include <llvm/Analysis/BasicAliasAnalysis.h>
+//#include <llvm/Analysis/BasicAliasAnalysis.h>
 #include <llvm/Transforms/Scalar.h>
 
 typedef struct loader_impl_llvm_function_type

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,7 @@ endif()`
`7`	`7`	`# External dependencies`
`8`	`8`	`#`
`9`	`9`
`10`		`-# TODO: Find here how to specify that we only support version 11`
`11`		`-# https://llvm.org/docs/CMake.html#embedding-llvm-in-your-project`
`12`		`-find_package(LLVM REQUIRED)`
	`10`	`+find_package(LLVM 11.0.1 REQUIRED)`
`13`	`11`
`14`	`12`	`#`
`15`	`13`	`# Plugin name and options`
`@@ -118,6 +116,9 @@ set_target_properties(${target}`
`118`	`116`	`BUNDLE $<$<BOOL:${APPLE}>:$<$<VERSION_GREATER:${PROJECT_OS_VERSION},8>>>`
`119`	`117`	`)`
`120`	`118`
	`119`	`+# Setting C++ 17 Standard.`
	`120`	`+set_property(TARGET ${target} PROPERTY CXX_STANDARD 17)`
	`121`	`+`
`121`	`122`	`#`
`122`	`123`	`# Include directories`
`123`	`124`	`#`