Merge pull request #14 from IITH-Compilers/cmake-fixes

Fixed cmake linking issues

CMakeLists.txt

@@ -53,9 +53,7 @@ if(LLVM_MLBRIDGE)
 
   LINK_LIBS
   ModelRunnerLib
-  $<TARGET_OBJECTS:SerDesLib>
-  tf_xla_runtime
-  protobuf::libprotobuf
+  SerDesLib
   )
 
   target_include_directories(LLVMMLBridge SYSTEM PUBLIC ${Protobuf_INCLUDE_DIRS} ${TENSORFLOW_AOT_PATH}/include)
@@ -66,7 +64,7 @@ else()
   llvm_map_components_to_libnames(llvm_libs support core irreader analysis TransformUtils)
 
   add_library(MLCompilerBridge STATIC tools.cpp)
-  target_link_libraries(MLCompilerBridge PUBLIC SerDesLib ModelRunnerLib ONNXModelRunnerLib ${llvm_libs} tf_xla_runtime protobuf::libprotobuf)
+  target_link_libraries(MLCompilerBridge PUBLIC SerDesLib ModelRunnerLib ONNXModelRunnerLib ${llvm_libs})
   set_target_properties(MLCompilerBridge PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
   set_property(TARGET MLCompilerBridge PROPERTY POSITION_INDEPENDENT_CODE 1)
   install(TARGETS MLCompilerBridge DESTINATION lib)

MLModelRunner/ONNXModelRunner/CMakeLists.txt

@@ -50,6 +50,6 @@ add_library(ONNXModelRunnerLib OBJECT onnx.cpp
     )
 endif(LLVM_MLBRIDGE)
 
-target_link_libraries(ONNXModelRunnerLib PUBLIC onnxruntime)
 target_include_directories(ONNXModelRunnerLib PUBLIC "${ONNXRUNTIME_ROOTDIR}/include" "${ONNXRUNTIME_ROOTDIR}/include/onnxruntime/core/session" ${TENSORFLOW_AOT_PATH}/include)
 target_link_directories(ONNXModelRunnerLib PUBLIC ${ONNXRUNTIME_ROOTDIR}/lib)
+target_link_libraries(ONNXModelRunnerLib PRIVATE onnxruntime)

SerDes/CMakeLists.txt

@@ -15,4 +15,5 @@ else()
 
   add_library(SerDesCLib OBJECT TensorSpec.cpp jsonSerDes.cpp bitstreamSerDes.cpp JSON.cpp)
 endif()
-target_include_directories(SerDesLib PRIVATE ${TENSORFLOW_AOT_PATH}/include)
+target_include_directories(SerDesLib PUBLIC ${TENSORFLOW_AOT_PATH}/include)
+target_link_libraries(SerDesLib PRIVATE tf_xla_runtime)