diff --git a/CMakeLists.txt b/CMakeLists.txt
index 400214efd..d16e82207 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -496,16 +496,37 @@ if(${AOCL_BLIS_FAMILY} STREQUAL "zen")
     " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/haswell/"
 elseif (${AOCL_BLIS_FAMILY} STREQUAL "zen2")
     " ${CMAKE_CURRENT_SOURCE_DIR}/config/zen2/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen2/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/haswell/"
+elseif (${AOCL_BLIS_FAMILY} STREQUAL "zen3")
+    " ${CMAKE_CURRENT_SOURCE_DIR}/config/zen3/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen3/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen2/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/haswell/"
+elseif (${AOCL_BLIS_FAMILY} STREQUAL "zen4")
+    " ${CMAKE_CURRENT_SOURCE_DIR}/config/zen4/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen4/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/skx/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen3/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen2/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/haswell/"
+elseif (${AOCL_BLIS_FAMILY} STREQUAL "amdzen")
     " ${CMAKE_CURRENT_SOURCE_DIR}/config/amdzen/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/config/zen/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/config/zen2/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/config/zen3/"
-     " ${CMAKE_CURRENT_SOURCE_DIR}/config/zen4/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/config/zen4/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/config/generic/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen4/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/skx/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen3/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen2/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/zen/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/haswell/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/kernels/generic/"
 endif ()
     " ${CMAKE_CURRENT_SOURCE_DIR}/frame/0/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/frame/0/copysc/"