diff --git a/CMakeLists.txt b/CMakeLists.txt
index a04f1d9..abbd5ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,12 @@
-cmake_minimum_required(VERSION 2.8.5)
+cmake_minimum_required(VERSION 3.1)
+
+#Higher than 3.21
+if(CMAKE_VERSION VERSION_GREATER 3.21)
+cmake_policy(SET CMP0128 NEW)
+endif()
+if(CMAKE_VERSION VERSION_GREATER 3.1)
+cmake_policy(SET CMP0054 NEW)
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE INTERNAL "limit build types" FORCE)
@@ -7,7 +15,7 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "default build type")
 set(CMAKE_INSTALL_SO_NO_EXE False)
 
 project(arib_std_b25 C)
-enable_language(CXX)
+enable_language("CXX")
 
 include(GitRevision)
 include(GenerateExportHeader)
@@ -99,10 +107,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "(GNU|Clang)")
 		set(CMAKE_C_FLAGS   "-mfpu=neon ${CMAKE_C_FLAGS}")
 		set(CMAKE_CXX_FLAGS "-mfpu=neon ${CMAKE_CXX_FLAGS}")
 	endif()
-elseif(CMAKE_C_COMPILER_ID MATCHES "(MSVC)")
+elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 	add_definitions("-D_CRT_SECURE_NO_WARNINGS")
-	set(CMAKE_STATIC_LIBRARY_PREFIX lib)
-	set(CMAKE_SHARED_LIBRARY_PREFIX lib)
 	set(CMAKE_SUPPRESS_REGENERATION TRUE)
 
 	if(USE_AVX2)
diff --git a/aribb25/td.c b/aribb25/td.c
index 03a033d..47bf547 100644
--- a/aribb25/td.c
+++ b/aribb25/td.c
@@ -1,9 +1,5 @@
 #define VERSION_STRING "0.2.7"
 
-#if defined(_WIN32)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>