Author: akhaldi
Date: Sat Apr 11 09:34:40 2015
New Revision: 67150
URL:
http://svn.reactos.org/svn/reactos?rev=67150&view=rev
Log:
[CMAKE/MSVC] x64 compilation is always treated as if /hotpatch has been specified.
CORE-7959
Modified:
trunk/reactos/cmake/CMakeMacros.cmake
Modified: trunk/reactos/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re…
==============================================================================
--- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Apr 11 09:34:40 2015
@@ -577,8 +577,8 @@
# Handle hotpatchable images.
# GCC has this as a function attribute so we're handling it using
DECLSPEC_HOTPATCH
if(__module_HOTPATCHABLE AND MSVC AND (NOT ARCH STREQUAL "arm"))
- set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS "
/hotpatch")
if(ARCH STREQUAL "i386")
+ set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS "
/hotpatch")
set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS "
/FUNCTIONPADMIN:5")
elseif(ARCH STREQUAL "amd64")
set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS "
/FUNCTIONPADMIN:6")