[ros-diffs] [tkreuzer] 56962: [CMAKE] - Add ARM architecture support - disable makefile debugging

Author: tkreuzer
Date: Tue Jul 24 18:54:31 2012
New Revision: 56962

URL: http://svn.reactos.org/svn/reactos?rev=56962&view=rev
Log:
[CMAKE]
- Add ARM architecture support
- disable makefile debugging

Modified:
    trunk/reactos/cmake/Platform/Windows-cl.cmake
    trunk/reactos/cmake/Platform/Windows.cmake

Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.…
==============================================================================
--- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] Tue Jul 24 18:54:31 2012
@@ -61,6 +61,28 @@
         set(ENV{STL_VER} 60)
     endif()
 endif()
+
+############
+
+# Set lib path for ARM compiler
+if(${ARCH} MATCHES arm)
+    message("Using ARM build for cross compilation. Host tools are x86.")
+
+    # Force C/C++ Compilers
+    include(CMakeForceCompiler)
+    CMAKE_FORCE_C_COMPILER(cl MSVC)
+    CMAKE_FORCE_CXX_COMPILER(cl MSVC)
+
+    if(NOT CMAKE_CROSSCOMPILING)
+        message("Using x86 target for ARM host tools.")
+        set(ARCH i386)
+
+        LINK_DIRECTORIES($ENV{WindowsSdkDir}\\Lib\\win8\\um\\x86)
+    endif()
+
+    #LINK_DIRECTORIES($ENV{LIB})
+endif()
+
 
 ############
 
@@ -234,6 +256,10 @@
 IF(NOT _MACHINE_ARCH_FLAG)
   SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID})
 ENDIF(NOT _MACHINE_ARCH_FLAG)
+# HACK
+if(${ARCH} MATCHES arm)
+  SET(_MACHINE_ARCH_FLAG ARM)
+endif()
 SET (CMAKE_EXE_LINKER_FLAGS_INIT
     "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000
/machine:${_MACHINE_ARCH_FLAG}")
 

Modified: trunk/reactos/cmake/Platform/Windows.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows.cma…
==============================================================================
--- trunk/reactos/cmake/Platform/Windows.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/Platform/Windows.cmake [iso-8859-1] Tue Jul 24 18:54:31 2012
@@ -30,7 +30,7 @@
 INCLUDE(Platform/WindowsPaths)
 
 # uncomment these out to debug nmake and borland makefiles
-SET(CMAKE_START_TEMP_FILE "")
-SET(CMAKE_END_TEMP_FILE "")
+#SET(CMAKE_START_TEMP_FILE "")
+#SET(CMAKE_END_TEMP_FILE "")
 #SET(CMAKE_VERBOSE_MAKEFILE 1)