diff options
Diffstat (limited to 'samples/common/cmake')
| -rw-r--r-- | samples/common/cmake/find_armnn.cmake | 17 | ||||
| -rw-r--r-- | samples/common/cmake/find_catch.cmake | 5 |
2 files changed, 17 insertions, 5 deletions
diff --git a/samples/common/cmake/find_armnn.cmake b/samples/common/cmake/find_armnn.cmake index 289e9127f6..35f87ebf19 100644 --- a/samples/common/cmake/find_armnn.cmake +++ b/samples/common/cmake/find_armnn.cmake @@ -2,8 +2,13 @@ # SPDX-License-Identifier: MIT # Search for ArmNN built libraries in user-provided path first, then current repository, then system -set(ARMNN_LIB_NAMES "libarmnn.so" - "libarmnnTfLiteParser.so") +if( USE_ARMNN_DELEGATE ) + set(ARMNN_LIB_NAMES "libarmnn.so" + "libarmnnDelegate.so") +else() + set(ARMNN_LIB_NAMES "libarmnn.so" + "libarmnnTfLiteParser.so") +endif() set(ARMNN_LIBS "") @@ -26,7 +31,13 @@ foreach(armnn_lib ${ARMNN_LIB_NAMES}) list(APPEND ARMNN_LIBS ${ARMNN_${armnn_lib}}) get_filename_component(LIB_DIR ${ARMNN_${armnn_lib}} DIRECTORY) get_filename_component(LIB_PARENT_DIR ${LIB_DIR} DIRECTORY) - set(ARMNN_INCLUDE_DIR ${LIB_PARENT_DIR}/include) + if( USE_ARMNN_DELEGATE ) + set(ARMNN_INCLUDE_DIR ${LIB_PARENT_DIR}/include + ${PARENT_DIR}/../delegate/include + ${PARENT_DIR}/../delegate/src) + else() + set(ARMNN_INCLUDE_DIR ${LIB_PARENT_DIR}/include) + endif() endif() endforeach() diff --git a/samples/common/cmake/find_catch.cmake b/samples/common/cmake/find_catch.cmake index 584b8073bd..f55654eecf 100644 --- a/samples/common/cmake/find_catch.cmake +++ b/samples/common/cmake/find_catch.cmake @@ -8,9 +8,10 @@ set(TEST_TPIP_INCLUDE ${TEST_TPIP}/include) file(MAKE_DIRECTORY ${TEST_TPIP_INCLUDE}) ExternalProject_Add(catch2-headers - URL https://github.com/catchorg/Catch2/releases/download/v2.11.1/catch.hpp + URL https://github.com/catchorg/Catch2/releases/download/v2.13.5/catch.hpp + URL_HASH MD5=b43c586fe617aefdee3e480e9fa8f370 DOWNLOAD_NO_EXTRACT 1 CONFIGURE_COMMAND "" BUILD_COMMAND ${CMAKE_COMMAND} -E copy <DOWNLOAD_DIR>/catch.hpp ${TEST_TPIP_INCLUDE} INSTALL_COMMAND "" - )
\ No newline at end of file + ) |