diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt
index b54fd4298b..416cf0da8c 100644
--- a/projects/clr/opencl/CMakeLists.txt
+++ b/projects/clr/opencl/CMakeLists.txt
@@ -7,6 +7,13 @@ endif()
 
 project(OpenCL-ROCm)
 
+# Add path for custom modules
+set(CMAKE_MODULE_PATH
+  ${CMAKE_MODULE_PATH}
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
+  )
+
 set(LLVM_INCLUDE_TESTS CACHE BOOL OFF)
 set(LLVM_TARGETS_TO_BUILD "AMDGPU" CACHE STRING "")
 set(LLVM_ENABLE_PROJECTS CACHE STRING "clang")
@@ -40,5 +47,6 @@ add_subdirectory(compiler/lib/loaders/elf/utils/libelf)
 
 add_subdirectory(tools/bc2h)
 
+find_package(ROCR REQUIRED)
 add_subdirectory(runtime)
 add_subdirectory(api/opencl/amdocl)
diff --git a/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt b/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt
index 2165dcf9ab..4698bd8054 100644
--- a/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt
+++ b/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_library(HSA_LIB hsa-runtime64 HINTS /opt/rocm/lib)
-
 set(CMAKE_CXX_FLAGS "-std=c++11")
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic -Wl,--unresolved-symbols=report-all -Wl,--version-script=${CMAKE_SOURCE_DIR}/api/opencl/amdocl/amdocl.map")
 
@@ -46,4 +44,4 @@ add_library(amdocl64 SHARED
   $<TARGET_OBJECTS:oclrocm>
 )
 
-target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${HSA_LIB})
+target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCR_LIBRARIES})