From df12d5a0f9df38889f8a5424f70c642d488f1e69 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Mon, 20 Jun 2016 22:00:52 +0530 Subject: [PATCH] Fix cmake issues in directed tests Change-Id: Ie2ae78022550d5d37c3dbfaecece7d879fb2d37a [ROCm/clr commit: 77933298dd655426b35a16380d2a107fd268f19f] --- projects/clr/hipamd/tests/src/CMakeLists.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/projects/clr/hipamd/tests/src/CMakeLists.txt b/projects/clr/hipamd/tests/src/CMakeLists.txt index eed4356405..723b99a243 100644 --- a/projects/clr/hipamd/tests/src/CMakeLists.txt +++ b/projects/clr/hipamd/tests/src/CMakeLists.txt @@ -1,13 +1,5 @@ cmake_minimum_required (VERSION 2.6) -# Must set CMAKE_CXX_COMPILER before any project commands to appease CMAKE -set(HIP_PATH $ENV{HIP_PATH}) -if (NOT DEFINED HIP_PATH) - get_filename_component (HIP_PATH ../.. ABSOLUTE) -endif() -set (HIPCC ${HIP_PATH}/bin/hipcc) -set (CMAKE_CXX_COMPILER ${HIPCC}) - message (CMAKE_CXX_COMPILER = ${CMAKE_CXX_COMPILER} ) project (HIP_Unit_Tests) @@ -33,6 +25,10 @@ if(NOT DEFINED HIP_BUILD_LOCAL) endif() endif() +set(HIP_PATH $ENV{HIP_PATH}) +if (NOT DEFINED HIP_PATH) + get_filename_component (HIP_PATH ../.. ABSOLUTE) +endif() execute_process(COMMAND ${HIP_PATH}/bin/hipconfig --platform OUTPUT_VARIABLE HIP_PLATFORM) @@ -85,6 +81,8 @@ else() endif() +set (HIPCC ${HIP_PATH}/bin/hipcc) +set (CMAKE_CXX_COMPILER ${HIPCC} CACHE FILEPATH "CXX Compiler" FORCE) add_library(test_common OBJECT test_common.cpp )