Remove LLVM subproject, use embedding instead

Author: layus

vm/boostenv/main/CMakeLists.txt

@@ -41,12 +41,13 @@ set(GENERATED_BOOSTSOURCES_CACHED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cached/)
 set(GENERATED_BOOSTSOURCES_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated/)
 
 # Generate sources
+find_program(clang_bin clang++)
 
 add_custom_command(
   OUTPUT ${GENERATED_BOOSTSOURCES_BINARY_DIR}/boostenv.gen
 
   # First pass: generate data types and interfaces
-  COMMAND ${LLVM_BUILD_DIR}/bin/clang++ "${CXX_STD_OPT}"
+  COMMAND ${clang_bin} "${CXX_STD_OPT}"
     -Wno-invalid-noreturn -Wno-return-type
     -o ${GENERATED_BOOSTSOURCES_BINARY_DIR}/boostenv.ast
     -I ${Boost_INCLUDE_DIRS}
@@ -59,7 +60,7 @@ add_custom_command(
     ${GENERATED_BOOSTSOURCES_BINARY_DIR}/
 
   # Second pass: generate builtin information
-  COMMAND ${LLVM_BUILD_DIR}/bin/clang++ "${CXX_STD_OPT}"
+  COMMAND ${clang_bin} "${CXX_STD_OPT}"
     -Wno-invalid-noreturn -Wno-return-type
     -o ${GENERATED_BOOSTSOURCES_BINARY_DIR}/boostenvmodules.astbi
     -I ${Boost_INCLUDE_DIRS}

vm/generator/main/CMakeLists.txt

@@ -1,33 +1,13 @@
-set(CLANG_SRC_DIR "${LLVM_SRC_DIR}/tools/clang")
-set(CLANG_BUILD_DIR "${LLVM_BUILD_DIR}/tools/clang")
 
-add_definitions(-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
+find_package(LLVM REQUIRED CONFIG)
+message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
-set(CMAKE_CXX_FLAGS "-Wall -Wno-enum-compare -Wno-strict-aliasing -std=gnu++0x ${CMAKE_CXX_FLAGS}")
+find_package(Clang REQUIRED CONFIG)
+message(STATUS "Found Clang using ClangConfig.cmake in: ${Clang_DIR}")
 
-# Depending on the platform and version of clang, the clang library will
-# be named libclang or liblibclang. Now we detect that.
-find_library(CLANG_LIBRARY
-  NAMES clang libclang
-  PATHS "${LLVM_BUILD_DIR}/lib"
-  NO_DEFAULT_PATH)
+#include_directories(${LLVM_INCLUDE_DIRS})
+#add_definitions(${LLVM_DEFINITIONS})
 
-include_directories(
-  "${LLVM_SRC_DIR}/include"
-  "${LLVM_BUILD_DIR}/include"
-  "${CLANG_SRC_DIR}/include"
-  "${CLANG_BUILD_DIR}/include")
-link_directories("${LLVM_BUILD_DIR}/lib")
-
-if(NOT CLANG_LIBRARY)
-  if(NOT MOZART_CACHED_BUILD)
-      message(FATAL_ERROR "Could not find clang library in ${LLVM_BUILD_DIR}")
-      set("CLANG_LIBRARY" "/not_found/")
-  endif()
-  # With MOZART_CACHED_BUILD, we should not require LLVM/Clang at all
-  # TODO: Fail verbosely if target "generator" is ever required.
-else()
-  add_executable(generator EXCLUDE_FROM_ALL
-    generator.cc interfaces.cc implementations.cc builtins.cc utils.cc)
-  target_link_libraries(generator "${CLANG_LIBRARY}")
-endif()
+add_executable(generator EXCLUDE_FROM_ALL generator.cc interfaces.cc implementations.cc builtins.cc utils.cc)
+target_link_libraries(generator clangFrontend clangAST)

vm/vm/main/CMakeLists.txt

@@ -15,11 +15,13 @@ configure_file(
 set(GENERATED_SOURCES_CACHED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cached/)
 set(GENERATED_SOURCES_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated/)
 
+find_program(clang_bin clang++)
+
 add_custom_command(
   OUTPUT ${GENERATED_SOURCES_BINARY_DIR}/mozart.gen
 
   # First pass: generate data types and interfaces
-  COMMAND ${LLVM_BUILD_DIR}/bin/clang++ -std=c++0x
+  COMMAND ${clang_bin} -std=c++0x
     -Wno-invalid-noreturn -Wno-return-type
     -o ${GENERATED_SOURCES_BINARY_DIR}/mozart.ast
     -DMOZART_GENERATOR
@@ -30,7 +32,7 @@ add_custom_command(
     ${GENERATED_SOURCES_BINARY_DIR}/
 
   # Second pass: generate builtin information
-  COMMAND ${LLVM_BUILD_DIR}/bin/clang++ -std=c++0x
+  COMMAND ${clang_bin} -std=c++0x
     -Wno-invalid-noreturn -Wno-return-type
     -o ${GENERATED_SOURCES_BINARY_DIR}/coremodules.astbi
     -I ${GENERATED_SOURCES_BINARY_DIR}