Adding changes to CMakeLists in C-backend and updating install script to build...

Adding changes to CMakeLists in C-backend and updating install script to build HPVM in a single build

hpvm/llvm_installer/llvm_installer.sh

@@ -144,7 +144,7 @@ cp $CURRENT_DIR/CMakeLists.txt $HPVM_DIR
 cp -r $CURRENT_DIR/include $HPVM_DIR/
 cp -r $CURRENT_DIR/lib $HPVM_DIR/
 cp -r $CURRENT_DIR/projects $HPVM_DIR/
-rm -r $HPVM_DIR/projects/llvm-cbe
+#rm -r $HPVM_DIR/projects/llvm-cbe
 cp -r $CURRENT_DIR/test $HPVM_DIR/
 
 ls $HPVM_DIR
@@ -171,8 +171,8 @@ fi
 make -j$NUM_THREADS
 #make install
 
-cp -r $CURRENT_DIR/projects $HPVM_DIR/
-make -j$NUM_THREADS
+#cp -r $CURRENT_DIR/projects $HPVM_DIR/
+#make -j$NUM_THREADS
 
 
 if [ -x $INSTALL_DIR/bin/clang ]; then

hpvm/projects/llvm-cbe/lib/Target/CBackend/CMakeLists.txt

@@ -18,6 +18,11 @@ set(LLVM_LINK_COMPONENTS
   TransformUtils
   )
 
-add_llvm_target(CBackendCodeGen
+add_llvm_library(LLVMCBackendCodeGen
   CBackend.cpp
+
+  DEPENDS
+  intrinsics_gen
   )
+
+#add_dependencies(CBackendCodeGen intrinsics_gen)

hpvm/projects/llvm-cbe/lib/Target/CBackend/TargetInfo/CMakeLists.txt

-#include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
+include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
 #
 #add_llvm_library(LLVMCBackendInfo
 #  CBackendTargetInfo.cpp
@@ -14,4 +14,7 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_library(LLVMCBackendInfo
   CBackendTargetInfo.cpp
+
+  DEPENDS
+  intrinsics_gen
   )

hpvm/projects/llvm-cbe/tools/llvm-cbe/CMakeLists.txt

@@ -22,22 +22,29 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_tool(llvm-cbe
   llvm-cbe.cpp
+
+  DEPENDS
+  intrinsics_gen
   )
+
 export_executable_symbols(llvm-cbe)
-## Support plugins.
-#set(LLVM_NO_DEAD_STRIP 1)
-#
-#set(LLVM_LINK_COMPONENTS
-#  ${LLVM_TARGETS_TO_BUILD}
-#  BitReader
-#  AsmParser
-#  IRReader
-#  CBackendInfo
-#  CBackendCodeGen
-#  )
-#
-#
-#add_llvm_tool(llvm-cbe
-#  llvm-cbe.cpp
-#  )
-#export_executable_symbols(llvm-cbe)
+## Support plugins.
+#set(LLVM_NO_DEAD_STRIP 1)
+#
+#set(LLVM_LINK_COMPONENTS
+#  ${LLVM_TARGETS_TO_BUILD}
+#  BitReader
+#  AsmParser
+#  IRReader
+#  CBackendInfo
+#  CBackendCodeGen
+#  )
+#
+#
+#add_llvm_tool(llvm-cbe
+#  llvm-cbe.cpp
+#  )
+#export_executable_symbols(llvm-cbe)
+
+
+#add_dependencies(llvm-cbe intrinsics_gen)