Update CMake files to reference appropriate directories, this should …

…be the last of the fallout from the refactoring.

Should fix #57.

PiperOrigin-RevId: 513863434

tensorflow/compiler/xla/mlir_hlo/CMakeLists.txt

@@ -124,10 +124,8 @@ include(AddMLIR)
 include(HandleLLVMOptions)
 include_directories(${LLVM_INCLUDE_DIRS})
 include_directories(${MLIR_INCLUDE_DIRS})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 link_directories(${LLVM_BUILD_LIBRARY_DIR})
 add_definitions(${LLVM_DEFINITIONS})
 
@@ -154,11 +152,10 @@ endif()
 
 set(MLIR_HLO_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(MLIR_HLO_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
-set(MLIR_HLO_MAIN_INCLUDE_DIR ${MLIR_HLO_SOURCE_DIR}/include)
-set(MLIR_HLO_GEN_INCLUDE_DIR ${MLIR_HLO_BINARY_DIR}/include)
+set(MLIR_HLO_MAIN_INCLUDE_DIR ${MLIR_HLO_SOURCE_DIR})
+set(MLIR_HLO_GEN_INCLUDE_DIR ${MLIR_HLO_BINARY_DIR})
 set(MLIR_HLO_TOOLS_DIR ${MLIR_HLO_BINARY_DIR}/bin)
 set(MLIR_HLO_LIB_DIR ${MLIR_HLO_BINARY_DIR}/lib)
-
 add_custom_target(check-mlir-hlo)
 
 add_subdirectory(analysis)

tensorflow/compiler/xla/mlir_hlo/cmake/modules/CMakeLists.txt

@@ -51,7 +51,7 @@ set(MHLO_CONFIG_CMAKE_DIR "\${MHLO_INSTALL_PREFIX}/${MHLO_INSTALL_PACKAGE_DIR}")
 set(MHLO_CONFIG_LLVM_CMAKE_DIR "\${MHLO_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")
 get_config_exports_includes(MHLO MHLO_CONFIG_INCLUDE_EXPORTS)
 set(MHLO_CONFIG_INCLUDE_DIRS
-  "\${MHLO_INSTALL_PREFIX}/include"
+  "\${MHLO_INSTALL_PREFIX}"
   )
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/MHLOConfig.cmake.in