Fix checks if HIP_COMPILER is hcc

Lower case "hcc" should be used.
ROCm · Aug 29, 2018 · 5bd41b9 · 5bd41b9
1 parent 351782e
commit 5bd41b9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -79,7 +79,7 @@ add_rocprim_benchmark_hip(benchmark_hip_warp_sort.cpp)
 add_rocprim_benchmark_hip(benchmark_hip_device_memory.cpp)
 
 # rocPRIM HC benchmarks
-if(HIP_COMPILER STREQUAL "HCC")
+if(HIP_COMPILER STREQUAL "hcc")
 add_rocprim_benchmark_hc(benchmark_hc_block_discontinuity.cpp)
 add_rocprim_benchmark_hc(benchmark_hc_block_exchange.cpp)
 add_rocprim_benchmark_hc(benchmark_hc_block_histogram.cpp)

diff --git a/cmake/VerifyCompiler.cmake b/cmake/VerifyCompiler.cmake
@@ -55,7 +55,7 @@ elseif(HIP_PLATFORM STREQUAL "hcc")
     list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hcc /opt/rocm/hip)
     # Ignore hcc warning: argument unused during compilation: '-isystem /opt/rocm/hip/include'
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument")
-    if(HIP_COMPILER STREQUAL "HCC")
+    if(HIP_COMPILER STREQUAL "hcc")
       find_package(hcc REQUIRED CONFIG PATHS /opt/rocm)
     else()
       find_package(hcc QUIET CONFIG PATHS /opt/rocm)

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -52,6 +52,6 @@ endfunction()
 # ****************************************************************************
 
 add_rocprim_example_hip(example_hip_temporary_storage.cpp)
-if(HIP_COMPILER STREQUAL "HCC")
+if(HIP_COMPILER STREQUAL "hcc")
 add_rocprim_example_hc(example_hc_temporary_storage.cpp)
 endif()
diff --git a/rocprim/CMakeLists.txt b/rocprim/CMakeLists.txt
@@ -41,7 +41,7 @@ target_include_directories(rocprim
 
 # This target allows using only HC interface, links only
 # against HC/HSA library, doesn't require HIP
-if(HIP_COMPILER STREQUAL "HCC" OR hcc_FOUND)
+if(HIP_COMPILER STREQUAL "hcc" OR hcc_FOUND)
   add_library(rocprim_hc INTERFACE)
   target_link_libraries(rocprim_hc
     INTERFACE

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -61,7 +61,7 @@ function(add_hc_test TEST_NAME TEST_SOURCES)
     PUBLIC
       ${GTEST_INCLUDE_DIRS}
   )
-  if(HIP_COMPILER STREQUAL "HCC")
+  if(HIP_COMPILER STREQUAL "hcc")
     target_link_libraries(${TEST_TARGET}
       PRIVATE
         hcc::hccrt
@@ -94,7 +94,7 @@ endfunction()
 # HC and HIP tests without using rocPRIM
 if(HIP_PLATFORM STREQUAL "hcc")
   add_hip_test("hip.device_api"  test_hip_api.cpp)
-  if(HIP_COMPILER STREQUAL "HCC")
+  if(HIP_COMPILER STREQUAL "hcc")
     add_hc_test ("hc.device_api" test_hc_api.cpp)
   endif()
 endif()

diff --git a/test/rocprim/CMakeLists.txt b/test/rocprim/CMakeLists.txt
@@ -63,7 +63,7 @@ endfunction()
 #
 
 # HCP basic test, which also checks if there are no linkage problems when there are multiple sources
-if(HIP_COMPILER STREQUAL "HCC")
+if(HIP_COMPILER STREQUAL "hcc")
 add_rocprim_test_hc("rocprim.hc.basic_test" "test_hc_basic.cpp;detail/get_rocprim_version_hc.cpp")
 
 add_rocprim_test_hc("rocprim.hc.arg_index_iterator" test_hc_arg_index_iterator.cpp)