diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3667ed6ba974..4e96a7b15986 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -448,15 +448,10 @@ endif(USE_KALLOC_ALIGNMENT)
 include(cmake/utils/CCache.cmake)
 
 include(CheckCXXCompilerFlag)
-if(NOT MSVC)
-  check_cxx_compiler_flag("-std=c++17" SUPPORT_CXX17)
-  set(CMAKE_CXX_FLAGS "-std=c++17 ${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CUDA_STANDARD 17)
-else()
-  check_cxx_compiler_flag("/std:c++17" SUPPORT_CXX17)
-  set(CMAKE_CXX_FLAGS "/std:c++17 ${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CUDA_STANDARD 17)
-endif()
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CUDA_STANDARD_REQUIRED ON)
+set(CMAKE_CUDA_STANDARD 17)
 
 # Module rules
 include(cmake/modules/CUDA.cmake)