From bcbeee6f2cd848e1a07f24eca59cb1fa66d40b99 Mon Sep 17 00:00:00 2001 From: Ben Sander Date: Fri, 17 Jun 2016 12:07:14 -0500 Subject: [PATCH] Fix hierchical tests. Set compiler before project to avoid loop Change-Id: Icede4e76cb47820b39403a7f1ba3f4bd3f47ed03 --- tests/src/CMakeLists.txt | 17 ++++++++++------- tests/src/launch_bounds/CMakeLists.txt | 2 ++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt index f1e37d242b..60e0472292 100644 --- a/tests/src/CMakeLists.txt +++ b/tests/src/CMakeLists.txt @@ -1,4 +1,13 @@ 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}) + project (HIP_Unit_Tests) include(CTest) @@ -22,10 +31,6 @@ 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) @@ -77,8 +82,6 @@ else() MESSAGE (FATAL_ERROR "UNKNOWN HIP_PLATFORM=" ${HIP_PLATFORM}) endif() -set (HIPCC ${HIP_PATH}/bin/hipcc) -set (CMAKE_CXX_COMPILER ${HIPCC}) add_library(test_common OBJECT test_common.cpp ) @@ -199,7 +202,7 @@ make_hip_executable (hipPeerToPeer_simple hipPeerToPeer_simple.cpp) make_hip_executable (hipMemcpyAll hipMemcpyAll.cpp) make_hip_executable (hipMultiThreadDevice hipMultiThreadDevice.cpp) make_hip_executable (hipTestMemcpyPin hipTestMemcpyPin.cpp) -make_hip_executable (hipDynamicShared hipDynamicShared.cpp) +#make_hip_executable (hipDynamicShared hipDynamicShared.cpp) make_hip_executable (hipTestDevice hipTestDevice.cpp) make_hip_executable (hipTestDeviceDouble hipTestDeviceDouble.cpp) diff --git a/tests/src/launch_bounds/CMakeLists.txt b/tests/src/launch_bounds/CMakeLists.txt index 6d2459ab25..d66b90a09c 100644 --- a/tests/src/launch_bounds/CMakeLists.txt +++ b/tests/src/launch_bounds/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required (VERSION 2.6) +project (launch_bounds) + include_directories( ${HIPTEST_SOURCE_DIR} ) make_hip_executable (hip_launch_bounds hip_launch_bounds.cpp)