[ros-diffs] [akhaldi] 50320: [CMAKE] - Add -fshort-wchar to host tools

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Sat Jan  8 11:52:58 2011
New Revision: 50320

URL: http://svn.reactos.org/svn/reactos?rev=50320&view=rev
Log:
[CMAKE]
- Add -fshort-wchar to host tools

Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/gcc.cmake

Modified: branches/cmake-bringup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=50320&r1=50319&r2=50320&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Jan  8 11:52:58 2011
@@ -17,6 +17,8 @@
 
 if(NOT CMAKE_CROSSCOMPILING)
 
+    add_definitions(-fshort-wchar)
+
     add_definitions(-DTARGET_${ARCH})
 
     if(ARCH MATCHES i386)
@@ -51,14 +53,14 @@
     set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
     include(${IMPORT_EXECUTABLES})
 
-endif(NOT CMAKE_CROSSCOMPILING)
+endif()
 
 # Compiler specific definitions and macros
 if(MSVC)
     include(msc.cmake)
 else()
     include(gcc.cmake)
-endif(MSVC)
+endif()
 
 # Generic macros
 include(CMakeMacros.cmake)

Modified: branches/cmake-bringup/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=50320&r1=50319&r2=50320&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Jan  8 11:52:58 2011
@@ -1,9 +1,5 @@
 
-if(NOT CMAKE_CROSSCOMPILING)
-
-add_definitions(-fshort-wchar)
-
-else()
+if(CMAKE_CROSSCOMPILING)
 
 # Linking
 link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)