Merge pull request #245 from FloopCZ/bin-include

Add bazel-bin/bin to the list of include dirs

Author: FloopCZ

tensorflow_cc/CMakeLists.txt

@@ -40,10 +40,13 @@ include(TensorflowBase)
 add_library(tensorflow_cc INTERFACE)
 target_compile_features(tensorflow_cc INTERFACE ${TARGET_CXX_STANDARD})
 
+# The include folders are sometimes contained under bazel-bin/bin/ and sometimes just bazel-bin.
 target_include_directories(
   tensorflow_cc INTERFACE
   "${CMAKE_INSTALL_PREFIX}/include/tensorflow/bazel-bin/tensorflow/include"
   "${CMAKE_INSTALL_PREFIX}/include/tensorflow/bazel-bin/tensorflow/include/src"
+  "${CMAKE_INSTALL_PREFIX}/include/tensorflow/bazel-bin/bin/tensorflow/include"
+  "${CMAKE_INSTALL_PREFIX}/include/tensorflow/bazel-bin/bin/tensorflow/include/src"
 )
 target_link_libraries(
   tensorflow_cc INTERFACE

tensorflow_cc/cmake/TensorflowBase.cmake

@@ -13,4 +13,10 @@ ExternalProject_Add(
   CONFIGURE_COMMAND ""
   BUILD_COMMAND "${CMAKE_CURRENT_BINARY_DIR}/build_tensorflow.sh"
   INSTALL_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/cmake/copy_links.sh" bazel-bin
+          # The include folders are sometimes contained under bazel-bin/bin/ and sometimes just bazel-bin.
+          # Later, we include both so let's make sure they both exist so that CMake does not complain.
+          COMMAND mkdir -p "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/tensorflow/include/src"
+          COMMAND mkdir -p "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/bin/tensorflow/include/src"
+          COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/tensorflow/include/src/__placeholder__.h"
+          COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/bin/tensorflow/include/src/__placeholder__.h"
 )