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

[CMAKE] Disable policy CMP0091 and set /MT flag explicitly for Visual Studio generator

Browse source
This commit is contained in:
Jérôme Gardou 2021-01-22 12:11:34 +01:00 committed by Jérôme Gardou
parent c68739e566
commit 49000c6471
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -7,6 +7,13 @@ endif()
include(CMakeDependentOption) include(CMakeDependentOption)
# CMAKE_CROSSCOMPILING and MSVC_IDE are not set until project() is called, so let's test this instead
if ((DEFINED CMAKE_TOOLCHAIN_FILE) AND (CMAKE_GENERATOR MATCHES "Visual Studio.*"))
# Do not use MSVC_RUNTIME_LIBRARY target property. We use our own flags instead
message(WARNING "Setting policy CMP0091 to OLD behaviour")
cmake_policy(SET CMP0091 OLD)
endif()
project(REACTOS) project(REACTOS)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -120,6 +127,12 @@ else()
# Print build type # Print build type
message("-- Build Type: ${CMAKE_BUILD_TYPE}") message("-- Build Type: ${CMAKE_BUILD_TYPE}")
# Always add /MT in VS CMAKE_GENERATOR
if (MSVC_IDE)
add_compile_options("/MT")
endif()
# adjust the default behaviour of the FIND_XXX() commands: # adjust the default behaviour of the FIND_XXX() commands:
# search headers and libraries in the target environment, search # search headers and libraries in the target environment, search
# programs in the host environment # programs in the host environment

1
toolchain-msvc.cmake
View file

@ -64,7 +64,6 @@ else()
set(CMAKE_ASM_MASM_FLAGS_INIT "/Cp") set(CMAKE_ASM_MASM_FLAGS_INIT "/Cp")
endif() endif()
set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "") set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")
set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-msvc.cmake") set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-msvc.cmake")