Skip to content

Commit

Permalink
[Hexagon] Include Utils.cmake for tvm_file_glob used in HexagonSDK.cm…
Browse files Browse the repository at this point in the history
…ake (apache#9903)

Don't include it from HexagonSDK.cmake because the Hexagon SDK file can
be included from different directories.
  • Loading branch information
Krzysztof Parzyszek authored Jan 13, 2022
1 parent c4eaeb8 commit 48006f2
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions apps/hexagon_launcher/cmake/HexagonLauncher.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ endif()
set(TVM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../")

include(ExternalProject)
include("${TVM_SOURCE_DIR}/cmake/utils/Utils.cmake")
include("${TVM_SOURCE_DIR}/cmake/modules/HexagonSDK.cmake")

find_hexagon_sdk_root("${USE_HEXAGON_SDK}" "${USE_HEXAGON_ARCH}")
Expand Down
1 change: 1 addition & 0 deletions apps/hexagon_proxy_rpc/cmake/HexagonRPC.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ endif()
set(TVM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../")

include(ExternalProject)
include("${TVM_SOURCE_DIR}/cmake/utils/Utils.cmake")
include("${TVM_SOURCE_DIR}/cmake/modules/HexagonSDK.cmake")

find_hexagon_sdk_root("${USE_HEXAGON_SDK}" "${USE_HEXAGON_ARCH}")
Expand Down
1 change: 1 addition & 0 deletions cmake/libs/hexagon_rpc_skel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ set(TVM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
set(TVM_SRC_DIR "${TVM_SOURCE_DIR}/src")


include("${TVM_SOURCE_DIR}/cmake/utils/Utils.cmake")
include("${TVM_SOURCE_DIR}/cmake/modules/HexagonSDK.cmake")

find_hexagon_sdk_root("${USE_HEXAGON_SDK}" "${USE_HEXAGON_ARCH}")
Expand Down
2 changes: 2 additions & 0 deletions src/runtime/hexagon/android/sim/driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/config.cmake)
include(${CMAKE_CURRENT_BINARY_DIR}/config.cmake)
endif()

include(../../../../../../cmake/utils/Utils.cmake)

if("${HEXAGON_ARCH}" STREQUAL "")
set(DEFAULT_HEXAGON_ARCH "v66")
message(STATUS "HEXAGON_ARCH not defined, defaulting to ${DEFAULT_HEXAGON_ARCH}")
Expand Down
3 changes: 2 additions & 1 deletion src/runtime/hexagon/android/target/fastrpc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ if(NOT "${FASTRPC_LIBS}" STREQUAL "SKEL" AND
message(SEND_ERROR "Please set FASTRPC_LIBS to either SKEL or STUB")
endif()

include(../../../../../cmake/modules/HexagonSDK.cmake)
include(../../../../../../cmake/utils/Utils.cmake)
include(../../../../../../cmake/modules/HexagonSDK.cmake)

find_hexagon_sdk_root("${HEXAGON_SDK_ROOT}" "${HEXAGON_ARCH}")

Expand Down

0 comments on commit 48006f2

Please sign in to comment.