From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 22 Jan 2011 17:13:06 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~207
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=a3604ffda3c87adcc543d4c935985d537bf6fe30

[CMAKE]
- lowerize ARCH string (fixes cmlib)
- move definition

svn path=/branches/cmake-bringup/; revision=50465
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9cb0d17ecc..322c5c2d3cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ cmake_policy(SET CMP0005 OLD)
 if(NOT ARCH)
     set(ARCH i386)
 endif()
+string(TOLOWER ${ARCH} ARCH)
 
 # Compile options
 if(ARCH MATCHES i386)
@@ -25,10 +26,10 @@ if(NOT CMAKE_CROSSCOMPILING)
 
     add_definitions(-DTARGET_${ARCH})
 
-    if(ARCH MATCHES i386)
-        if(MSVC)
-            add_definitions(-Dinline=__inline)
-        endif()
+    if(MSVC)
+        add_definitions(-Dinline=__inline)
+    else()
+       add_definitions(-fshort-wchar)
     endif()
 
     include_directories(
@@ -39,10 +40,6 @@ if(NOT CMAKE_CROSSCOMPILING)
         include/reactos/wine
         ${REACTOS_BINARY_DIR}/include)
 
-    if(NOT MSVC)
-       add_definitions(-fshort-wchar)
-    endif()
-
     add_subdirectory(tools)
     add_subdirectory(lib)