diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab8177f1d2..8713afc6d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,11 @@ set(GLOBAL PROPERTY NEO_L0_COMPONENTS_LIST "")
 
 set(BRANCH_TYPE "")
 set(BRANCH_DIR_SUFFIX "/${BRANCH_TYPE}")
+list(APPEND BRANCH_DIR_LIST "/")
+if(NOT "${BRANCH_TYPE}" STREQUAL "")
+    list(APPEND BRANCH_DIR_LIST "/${BRANCH_TYPE}/")
+endif()
+message(STATUS "branch dir list: ${BRANCH_DIR_LIST}")
 
 if(TR_DEPRECATED)
     add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1)
diff --git a/opencl/source/enable_gens.cmake b/opencl/source/enable_gens.cmake
index b2967d7784..b792af15dc 100644
--- a/opencl/source/enable_gens.cmake
+++ b/opencl/source/enable_gens.cmake
@@ -49,7 +49,11 @@ macro(macro_for_each_platform)
   endforeach()
 
   foreach(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.inl")
-    list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}/${PLATFORM_FILE})
+    foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
+      if(EXISTS ${GENX_PREFIX}${BRANCH_DIR}${PLATFORM_FILE})
+        list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}${BRANCH_DIR}${PLATFORM_FILE})
+      endif()
+    endforeach()
   endforeach()
 
   list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.inl)
diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
index e96600800c..1d9c9c5053 100644
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -90,15 +90,24 @@ set(RUNTIME_GENX_CPP_FILES
 )
 
 macro(macro_for_each_platform)
-  list(APPEND CLOC_LIB_SRCS_LIB ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.inl)
+  foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
+    if(EXISTS ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}${BRANCH_DIR}hw_info_${PLATFORM_IT_LOWER}.inl)
+      list(APPEND CLOC_LIB_SRCS_LIB ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}/${BRANCH_DIR}hw_info_${PLATFORM_IT_LOWER}.inl)
+    endif()
+  endforeach()
 endmacro()
 
 macro(macro_for_each_gen)
   foreach(SRC_IT ${RUNTIME_GENX_CPP_FILES})
-    set(SRC_FILE ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}/${SRC_IT})
-    if(EXISTS ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp)
-      list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp)
-    endif()
+    foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
+      set(SRC_FILE ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT})
+      string(REGEX REPLACE "/$" "" _BRANCH_SUFFIX "${BRANCH_DIR}")
+      string(REGEX REPLACE "^/" "_" _BRANCH_SUFFIX "${_BRANCH_SUFFIX}")
+
+      if(EXISTS ${SRC_FILE}_${GEN_TYPE_LOWER}${_BRANCH_SUFFIX}.cpp)
+        list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}_${GEN_TYPE_LOWER}${_BRANCH_SUFFIX}.cpp)
+      endif()
+    endforeach()
   endforeach()
   apply_macro_for_each_platform()