Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE] Bump minimum to 3.17, no longer require -ReactOS build. CORE-17109

Browse source
This commit is contained in:
Thomas Faber 2020-06-06 22:59:26 +02:00
parent 3169c94e06
commit add677e45b
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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")

2
ntoskrnl/ntkrnlmp/CMakeLists.txt
View file

@ -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()

6
sdk/cmake/msvc.cmake
View file

@ -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.