Author: akhaldi
Date: Mon May 26 15:31:07 2014
New Revision: 63469
URL:
http://svn.reactos.org/svn/reactos?rev=63469&view=rev
Log:
[CMAKE/ARM]
* Do not handle hotpatchable images in MSVC ARM builds (the flag is unknown to the
compiler).
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] Mon May 26 15:31:07 2014
@@ -459,7 +459,7 @@
# Handle hotpatchable images.
# GCC has this as a function attribute so we're handling it using
DECLSPEC_HOTPATCH
- if(__module_HOTPATCHABLE AND MSVC)
+ 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 LINK_FLAGS "
/FUNCTIONPADMIN:5")