diff options
Diffstat (limited to 'delegate/cmake')
-rw-r--r-- | delegate/cmake/Modules/ArmnnDelegateConfig.cmake.in | 6 | ||||
-rw-r--r-- | delegate/cmake/Modules/FindTensorflow.cmake | 30 |
2 files changed, 4 insertions, 32 deletions
diff --git a/delegate/cmake/Modules/ArmnnDelegateConfig.cmake.in b/delegate/cmake/Modules/ArmnnDelegateConfig.cmake.in index c403068db8..c878c46ad3 100644 --- a/delegate/cmake/Modules/ArmnnDelegateConfig.cmake.in +++ b/delegate/cmake/Modules/ArmnnDelegateConfig.cmake.in @@ -9,10 +9,12 @@ MESSAGE(STATUS "Found ArmnnDelegate: ${ARMNN_DELEGATE_CONFIG_FILE}") include(CMakeFindDependencyMacro) -find_dependency(Armnn REQUIRED CONFIG) - list(APPEND CMAKE_MODULE_PATH ${ARMNN_DELEGATE_CMAKE_DIR}) +@PACKAGE_INIT@ +set_and_check(Armnn_DIR "@Armnn_DIR@") +find_dependency(Armnn REQUIRED CONFIG HINTS ${Armnn_DIR}) + if(NOT TARGET ArmnnDelegate::ArmnnDelegate) MESSAGE(STATUS "ArmnnDelegate Import: ${ARMNN_DELEGATE_CMAKE_DIR}/ArmnnDelegateTargets.cmake") include("${ARMNN_DELEGATE_CMAKE_DIR}/ArmnnDelegateTargets.cmake") diff --git a/delegate/cmake/Modules/FindTensorflow.cmake b/delegate/cmake/Modules/FindTensorflow.cmake deleted file mode 100644 index 8f90011a65..0000000000 --- a/delegate/cmake/Modules/FindTensorflow.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright © 2020 Arm Ltd and Contributors. All rights reserved. -# SPDX-License-Identifier: MIT -# - -include(FindPackageHandleStandardArgs) -unset(TENSORFLOW_FOUND) - -find_path(Tensorflow_INCLUDE_DIR - NAMES - tensorflow/core - tensorflow/cc - third_party - HINTS - ${TENSORFLOW_ROOT}) - -find_library(Tensorflow_LIB - NAMES - tensorflow_all - HINTS - ${TENSORFLOW_LIB_DIR}) - -## Set TENSORFLOW_FOUND -find_package_handle_standard_args(Tensorflow DEFAULT_MSG Tensorflow_INCLUDE_DIR Tensorflow_LIB) - -## Set external variables for usage in CMakeLists.txt -if(TENSORFLOW_FOUND) - set(Tensorflow_LIB ${Tensorflow_LIB}) - set(Tensorflow_INCLUDE_DIRS ${Tensorflow_INCLUDE_DIR}) -endif()
\ No newline at end of file |