diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index ce53cad2f2..d6d59d02e4 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -105,7 +105,7 @@ if(WIN32)
 endif()
 
 add_subdirectory(indirect_heap)
-add_subdirectory(instrumentation)
+add_subdirectory(instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
 add_subdirectory(kernel)
 add_subdirectory(mem_obj)
 add_subdirectory(memory_manager)
diff --git a/runtime/instrumentation/CMakeLists.txt b/runtime/instrumentation/CMakeLists.txt
index 09d83946b3..4d77e3e141 100644
--- a/runtime/instrumentation/CMakeLists.txt
+++ b/runtime/instrumentation/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 set(RUNTIME_SRCS_INSTRUMENTATION
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}${IGDRCL__INSTRUMENTATION_DIR_SUFFIX}/instrumentation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}${IGDRCL__INSTRUMENTATION_DIR_SUFFIX}/instrumentation.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/instrumentation.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/instrumentation.h
   PARENT_SCOPE
 )