diff --git a/runtime/sharings/va/CMakeLists.txt b/runtime/sharings/va/CMakeLists.txt
index c4a2607083..00b92cd20a 100644
--- a/runtime/sharings/va/CMakeLists.txt
+++ b/runtime/sharings/va/CMakeLists.txt
@@ -1,20 +1,22 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
+set(RUNTIME_SRCS_SHARINGS_VA
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_va_api.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_defines.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_functions.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_functions.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_surface.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_surface.h
+)
+set_property(GLOBAL PROPERTY RUNTIME_SRCS_SHARINGS_VA ${RUNTIME_SRCS_SHARINGS_VA})
+
 if(IGDRCL__LIBVA_FOUND)
-  set(RUNTIME_SRCS_SHARINGS_VA
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_va_api.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_defines.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_functions.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_functions.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_surface.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_surface.h
-  )
   target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SHARINGS_VA})
 endif(IGDRCL__LIBVA_FOUND)
diff --git a/unit_tests/sharings/va/CMakeLists.txt b/unit_tests/sharings/va/CMakeLists.txt
index 311edf4783..37f6c47fde 100644
--- a/unit_tests/sharings/va/CMakeLists.txt
+++ b/unit_tests/sharings/va/CMakeLists.txt
@@ -1,23 +1,25 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
+set(IGDRCL_SRCS_tests_sharings_va
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_from_va_media_surface_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_acquire_va_media_surfaces_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_release_va_media_surfaces_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_extension_function_address_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/context_va_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/kernel_va_image_arg_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_va_sharing.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_base_object_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_linux_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_tests.cpp
+)
+set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_sharings_va ${IGDRCL_SRCS_tests_sharings_va})
+
 if(IGDRCL__LIBVA_FOUND)
-  set(IGDRCL_SRCS_tests_sharings_va
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_from_va_media_surface_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_acquire_va_media_surfaces_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_release_va_media_surfaces_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_extension_function_address_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/context_va_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_va_image_arg_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_va_sharing.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_base_object_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_enable_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_linux_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_tests.cpp
-  )
+  list(APPEND IGDRCL_SRCS_tests_sharings_va ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_enable_tests.cpp)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_sharings_va})
 endif(IGDRCL__LIBVA_FOUND)