From e5b673f2e2ee33b5da97361190b060afe83b8353 Mon Sep 17 00:00:00 2001 From: Anusha GodavarthySurya Date: Thu, 10 Jun 2021 05:01:40 -0700 Subject: [PATCH] SWDEV-290637 - Update tests to use current directory CMAKE_CURRENT_LIST_DIR instead of HIP_SRC_PATH to build from hipamd repo Change-Id: Ide04d9f7b1fc43b475d985a6dce0aa1bd2ec00da [ROCm/hip-tests commit: c749be32998d282924337a1632a431d2870de59b] --- projects/hip-tests/catch/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/hip-tests/catch/CMakeLists.txt b/projects/hip-tests/catch/CMakeLists.txt index 0292f378dc..d5eee44edc 100644 --- a/projects/hip-tests/catch/CMakeLists.txt +++ b/projects/hip-tests/catch/CMakeLists.txt @@ -14,7 +14,7 @@ if(NOT DEFINED CATCH2_PATH) if(DEFINED ENV{CATCH2_PATH}) set(CATCH2_PATH $ENV{CATCH2_PATH} CACHE STRING "Catch2 Path") else() - set(CATCH2_PATH "${CMAKE_CURRENT_SOURCE_DIR}/external/Catch2") + set(CATCH2_PATH "${CMAKE_CURRENT_LIST_DIR}/external/Catch2") endif() endif() message(STATUS "Catch2 Path: ${CATCH2_PATH}") @@ -24,14 +24,14 @@ if(NOT DEFINED JSON_PARSER) if(DEFINED ENV{JSON_PARSER}) set(JSON_PARSER $ENV{JSON_PARSER} CACHE STRING "JSON Parser Path") else() - set(JSON_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/external/picojson") + set(JSON_PARSER "${CMAKE_CURRENT_LIST_DIR}/external/picojson") endif() endif() -message(STATUS "Searching Catch2 in: ${CMAKE_CURRENT_SOURCE_DIR}/external") +message(STATUS "Searching Catch2 in: ${CMAKE_CURRENT_LIST_DIR}/external") find_package(Catch2 REQUIRED PATHS - ${CMAKE_CURRENT_SOURCE_DIR}/external + ${CMAKE_CURRENT_LIST_DIR}/external PATH_SUFFIXES Catch2/cmake/Catch2 )