TensorFlow: switch to using CTensorFlow from swift-apis

stdlib/public/TensorFlow/CMakeLists.txt

@@ -41,11 +41,10 @@ if (TENSORFLOW_SWIFT_APIS)
   endforeach()
 endif()
 
-get_filename_component(TensorFlow_LIBRARY_DIR ${TF_LIBRARY} DIRECTORY)
 add_swift_target_library(swiftTensorFlow ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   "${SOURCES}"
 
-  PRIVATE_LINK_LIBRARIES "${TF_LIBRARIES}"
+  PRIVATE_LINK_LIBRARIES ${TF_LIBRARY}
   SWIFT_MODULE_DEPENDS SwiftOnoneSupport
   SWIFT_MODULE_DEPENDS_IOS Darwin
   SWIFT_MODULE_DEPENDS_OSX Darwin
@@ -59,7 +58,7 @@ add_swift_target_library(swiftTensorFlow ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_
   SWIFT_MODULE_DEPENDS Python
   SWIFT_COMPILE_FLAGS
     ${swift_stdlib_compile_flags}
-    -Xcc -I${CMAKE_CURRENT_SOURCE_DIR}
+    -Xcc -I${TENSORFLOW_SWIFT_APIS}/Sources/CTensorFlow
     -Xcc -I${TF_INCLUDE_DIR}
   LINK_FLAGS
     ${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}
@@ -82,6 +81,8 @@ swift_install_in_component(DIRECTORY ${TF_INCLUDE_DIR}/tensorflow/c/
     PATTERN tf_status.h
     PATTERN tf_tensor.h
     PATTERN eager/c_api.h)
-swift_install_in_component(FILES module.modulemap CTensorFlow.h
+swift_install_in_component(FILES
+    ${TENSORFLOW_SWIFT_APIS}/Sources/CTensorFlow/module.modulemap
+    ${TENSORFLOW_SWIFT_APIS}/Sources/CTensorFlow/CTensorFlow.h
   DESTINATION lib/swift/tensorflow
   COMPONENT stdlib)