diff --git a/CMakeLists.txt b/CMakeLists.txt index 826eeb983a5..25ddb7f672a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.2.1) +cmake_minimum_required(VERSION 3.17.0) cmake_policy(VERSION 3.2.1) if(NOT CMAKE_VERSION MATCHES "ReactOS") diff --git a/ntoskrnl/ntkrnlmp/CMakeLists.txt b/ntoskrnl/ntkrnlmp/CMakeLists.txt index 7f8ff100556..eb9610e1719 100644 --- a/ntoskrnl/ntkrnlmp/CMakeLists.txt +++ b/ntoskrnl/ntkrnlmp/CMakeLists.txt @@ -4,7 +4,7 @@ include(../ntos.cmake) include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl) spec2def(ntkrnlmp.exe ../ntoskrnl.spec) -if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) +if(MSVC_IDE) set_source_files_properties(${NTKRNLMP_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "CONFIG_SMP") endif() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 7ed9c0c7da7..cbac0fc084c 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -173,7 +173,7 @@ else() set(cl_includes_flag "/showIncludes") endif() -if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) +if(MSVC_IDE) # For VS builds we'll only have en-US in resource files add_definitions(/DLANGUAGE_EN_US) else() @@ -467,7 +467,7 @@ function(allow_warnings __module) endfunction() macro(add_asm_files _target) - if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) + if(MSVC_IDE) get_defines(_directory_defines) get_includes(_directory_includes) get_directory_property(_defines COMPILE_DEFINITIONS) @@ -534,7 +534,7 @@ function(add_linker_script _target _linker_script_file) else() set(_no_std_includes_flag "/X") endif() - if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) + if(MSVC_IDE) # MSBuild, via the VS IDE, uses response files when calling CL or LINK. # We cannot specify a custom response file on the linker command-line, # since specifying response files from within response files is forbidden.