diff --git a/projects/clr/hipamd/vdi/CMakeLists.txt b/projects/clr/hipamd/vdi/CMakeLists.txt
index 0140408875..e132323a50 100644
--- a/projects/clr/hipamd/vdi/CMakeLists.txt
+++ b/projects/clr/hipamd/vdi/CMakeLists.txt
@@ -1,6 +1,5 @@
 #project("hip")
 cmake_minimum_required(VERSION 3.5.1)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-keep-memory -Wl,-Bsymbolic -Wl,--unresolved-symbols=report-all -Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/hip_hcc.map.in")
 
@@ -133,6 +132,13 @@ add_library(amdhip64 SHARED
  fixme.cpp
  )
 
+set_target_properties(
+    amdhip64 PROPERTIES
+        CXX_STANDARD 14
+        CXX_STANDARD_REQUIRED ON
+        CXX_EXTENSIONS OFF
+)
+
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 include(${LIBVDI_STATIC_DIR}/amdvdi_staticTargets.cmake)