SWDEV-530015 - Override ROCM_PATH with env if it is set (#171)

samples/0_Intro/bit_extract/CMakeLists.txt

@@ -32,12 +32,15 @@ endif()
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
 endif()
-
 # Find hip
 find_package(hip)
 

samples/0_Intro/generic_target/CMakeLists.txt

@@ -24,7 +24,11 @@ project(generic_target)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/0_Intro/module_api/CMakeLists.txt

@@ -26,7 +26,11 @@ include_directories(../../common)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/0_Intro/module_api_global/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/0_Intro/square/CMakeLists.txt

@@ -26,7 +26,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/1_Utils/hipDispatchLatency/CMakeLists.txt

@@ -26,7 +26,11 @@ include_directories(../../common)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/1_Utils/hipInfo/CMakeLists.txt

@@ -28,7 +28,11 @@ project(hipInfo)
 cmake_minimum_required(VERSION 3.10)
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/0_MatrixTranspose/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/10_inline_asm/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/11_texture_driver/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/12_cmake_hip_add_executable/CMakeLists.txt

@@ -21,7 +21,11 @@
 cmake_minimum_required(VERSION 3.10)
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm"  CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
 endif()
 

samples/2_Cookbook/13_occupancy/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/14_gpu_arch/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/15_static_library/device_functions/CMakeLists.txt

@@ -4,7 +4,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/15_static_library/host_functions/CMakeLists.txt

@@ -4,7 +4,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/16_assembly_to_executable/CMakeLists.txt

@@ -4,7 +4,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   if(NOT DEFINED HIP_PATH)
   if(NOT DEFINED ENV{HIP_PATH})

samples/2_Cookbook/17_llvm_ir_to_executable/CMakeLists.txt

@@ -4,7 +4,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   if(NOT DEFINED HIP_PATH)
   if(NOT DEFINED ENV{HIP_PATH})

samples/2_Cookbook/18_cmake_hip_device/CMakeLists.txt

@@ -26,7 +26,11 @@ include_directories(../../common)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/19_cmake_lang/CMakeLists.txt

@@ -9,7 +9,11 @@ project(cmake_lang_test CXX Fortran)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/1_hipEvent/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/21_cmake_hip_cxx_clang/CMakeLists.txt

@@ -26,7 +26,11 @@ project(cmake_cxx_amdclang++_test
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/23_cmake_hiprtc/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10.2)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/3_shared_memory/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/4_shfl/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/5_2dshfl/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/6_dynamic_shared/CMakeLists.txt

@@ -26,7 +26,11 @@ include_directories(../../common)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/7_streams/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/8_peer2peer/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})

samples/2_Cookbook/9_unroll/CMakeLists.txt

@@ -24,7 +24,11 @@ cmake_minimum_required(VERSION 3.10)
 
 if(UNIX)
   if(NOT DEFINED ROCM_PATH)
-    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    if(DEFINED ENV{ROCM_PATH})
+      set(ROCM_PATH $ENV{ROCM_PATH} CACHE STRING "ROCM Path")
+    else()
+      set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+    endif()
   endif()
   # Search for rocm in common locations
   list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})