X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fcmake%2Fmsvc.cmake;h=5585821292cc7f75a59d6275523635f9db042d37;hp=c97d997fc9f91c01e7d067023ad3bccb5bc42449;hb=079f80ff567c3ead09061e7a6d165c77294eb3eb;hpb=5caee6abdffb656898691a85c28a02476868491c diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake index c97d997fc9f..5585821292c 100644 --- a/reactos/cmake/msvc.cmake +++ b/reactos/cmake/msvc.cmake @@ -19,7 +19,7 @@ endif() add_definitions(/Dinline=__inline /D__STDC__=1) -add_compiler_flags(/X /GR- /GS- /Zl /W3) +add_compile_flags("/X /GR- /GS- /Zl /W3") if(${_MACHINE_ARCH_FLAG} MATCHES X86) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB") @@ -61,24 +61,24 @@ endmacro() function(set_entrypoint _module _entrypoint) if(${_entrypoint} STREQUAL "0") - add_linkerflag(${_module} "/NOENTRY") + add_target_link_flags(${_module} "/NOENTRY") elseif(ARCH MATCHES i386) set(_entrysymbol ${_entrypoint}) if (${ARGC} GREATER 2) set(_entrysymbol ${_entrysymbol}@${ARGV2}) endif() - add_linkerflag(${_module} "/ENTRY:${_entrysymbol}") + add_target_link_flags(${_module} "/ENTRY:${_entrysymbol}") else() - add_linkerflag(${_module} "/ENTRY:${_entrypoint}") + add_target_link_flags(${_module} "/ENTRY:${_entrypoint}") endif() endfunction() function(set_subsystem MODULE SUBSYSTEM) - add_linkerflag(${MODULE} "/subsystem:${SUBSYSTEM}") + add_target_link_flags(${MODULE} "/subsystem:${SUBSYSTEM}") endfunction() function(set_image_base MODULE IMAGE_BASE) - add_linkerflag(${MODULE} "/BASE:${IMAGE_BASE}") + add_target_link_flags(${MODULE} "/BASE:${IMAGE_BASE}") endfunction() function(set_module_type MODULE TYPE) @@ -108,21 +108,21 @@ function(set_module_type MODULE TYPE) else() message(STATUS "${MODULE} has no base address") endif() - add_linkerflag(${MODULE} "/DLL") + add_target_link_flags(${MODULE} "/DLL") elseif(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMainCRTStartup 12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") - add_linkerflag(${MODULE} "/DLL") + add_target_link_flags(${MODULE} "/DLL") elseif(${TYPE} MATCHES cpl) set_entrypoint(${MODULE} DllMainCRTStartup 12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") - add_linkerflag(${MODULE} "/DLL") + add_target_link_flags(${MODULE} "/DLL") elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry 8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) - add_linkerflag(${MODULE} "/DRIVER") + add_target_link_flags(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) elseif(${TYPE} MATCHES nativedll) set_subsystem(${MODULE} native) @@ -195,7 +195,7 @@ endfunction() macro(add_delay_importlibs MODULE) foreach(LIB ${ARGN}) - add_linkerflag(${MODULE} "/DELAYLOAD:${LIB}.dll") + add_target_link_flags(${MODULE} "/DELAYLOAD:${LIB}.dll") target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.LIB) add_dependencies(${MODULE} lib${LIB}) endforeach()