From 792639b6e6cb2d348e9da78b9a5d4619dc0b30e6 Mon Sep 17 00:00:00 2001 From: Terry Heo Date: Mon, 8 Feb 2021 23:55:35 -0800 Subject: [PATCH] cmake: Update absl.cmake Use Find.cmake instead of config.cmake to remove absl_DIR hack. PiperOrigin-RevId: 356438974 Change-Id: I5de67e21c2e55cad20ce3da002260acdd98c06b3 --- tensorflow/lite/CMakeLists.txt | 4 +--- .../tools/cmake/modules/{absl-config.cmake => Findabsl.cmake} | 0 2 files changed, 1 insertion(+), 3 deletions(-) rename tensorflow/lite/tools/cmake/modules/{absl-config.cmake => Findabsl.cmake} (100%) diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt index 29ab7c15a50..1ca503b839f 100644 --- a/tensorflow/lite/CMakeLists.txt +++ b/tensorflow/lite/CMakeLists.txt @@ -57,8 +57,6 @@ set(CMAKE_PREFIX_PATH "${TFLITE_SOURCE_DIR}/tools/cmake/modules" ${CMAKE_PREFIX_PATH} ) -# b/168750039: To workaround absl module not found error on Android build. -set(absl_DIR "${TFLITE_SOURCE_DIR}/tools/cmake/modules") option(TFLITE_ENABLE_RUY "Enable experimental RUY integration" OFF) option(TFLITE_ENABLE_RESOURCE "Enable experimental support for resources" ON) @@ -125,7 +123,7 @@ macro(populate_tf_source_vars RELATIVE_DIR SOURCES_VAR) ) endmacro() # Find TensorFlow Lite dependencies. -find_package(absl REQUIRED CONFIG) +find_package(absl REQUIRED) find_package(eigen REQUIRED) find_package(farmhash REQUIRED) find_package(fft2d REQUIRED) diff --git a/tensorflow/lite/tools/cmake/modules/absl-config.cmake b/tensorflow/lite/tools/cmake/modules/Findabsl.cmake similarity index 100% rename from tensorflow/lite/tools/cmake/modules/absl-config.cmake rename to tensorflow/lite/tools/cmake/modules/Findabsl.cmake