From 22aba5c9c5fa710912487da8268f8ea9e1bd81da Mon Sep 17 00:00:00 2001 From: Ben Sander Date: Thu, 24 Mar 2016 10:50:08 -0500 Subject: [PATCH] Set /opt/hcc correctly if HCC_HOME not defined [ROCm/hip commit: a24361df6f6afcf71b022e9dbe46f9d160191891] --- projects/hip/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt index e0175677bb..3f45d47860 100644 --- a/projects/hip/CMakeLists.txt +++ b/projects/hip/CMakeLists.txt @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 2.6) project(hip_hcc) +# preserve HCC_HOME env in the generated set (HCC_HOME $ENV{HCC_HOME}) if (NOT DEFINED HCC_HOME) - set(HCC_HOME "/opt/hcc") + set (HCC_HOME /opt/hcc) endif() - MESSAGE ("HCC_HOME=" ${HCC_HOME}) set(HSA_PATH "/opt/hsa") @@ -18,10 +18,10 @@ endif () include_directories(${PROJECT_SOURCE_DIR}/include) set(CMAKE_CXX_COMPILER "${HCC_HOME}/bin/hcc") -set(CMAKE_C_COMPILER "${HCC_HOME}/bin/hcc") +set(CMAKE_C_COMPILER "${HCC_HOME}/bin/hcc") -set(CMAKE_C_FLAGS " -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I${HIP_PATH}/include -stdlib=libc++ ") set(CMAKE_CXX_FLAGS " -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I${HIP_PATH}/include -stdlib=libc++ ") +set(CMAKE_C_FLAGS " -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I${HIP_PATH}/include -stdlib=libc++ ") set(SOURCE_FILES src/hip_hcc.cpp src/staging_buffer.cpp)