[ros-diffs] [tkreuzer] 56788: [CMAKE] - Fix issues with newer cmake versions (brought to you by Amine) - Add support for ninja to configure script

Author: tkreuzer
Date: Sat Jun 23 16:09:11 2012
New Revision: 56788

URL: http://svn.reactos.org/svn/reactos?rev=56788&view=rev
Log:
[CMAKE]
- Fix issues with newer cmake versions (brought to you by Amine)
- Add support for ninja to configure script

Modified:
    trunk/reactos/CMakeLists.txt
    trunk/reactos/configure.cmd

Modified: trunk/reactos/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=56788&a…
==============================================================================
--- trunk/reactos/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Jun 23 16:09:11 2012
@@ -14,6 +14,9 @@
 # Don't escape preprocessor definition values added via add_definitions
 cmake_policy(SET CMP0005 OLD)
 cmake_policy(SET CMP0002 NEW)
+if(POLICY CMP0018)
+    cmake_policy(SET CMP0018 OLD)
+endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
@@ -48,7 +51,7 @@
 
     if(MSVC)
         if(ARCH MATCHES i386)
-            add_definitions(/DWIN32 /D_WINDOWS)
+            add_definitions(/D_X86_ /DWIN32 /D_WINDOWS)
         endif()
         add_definitions(/Dinline=__inline)
     else()

Modified: trunk/reactos/configure.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=56788&am…
==============================================================================
--- trunk/reactos/configure.cmd [iso-8859-1] (original)
+++ trunk/reactos/configure.cmd [iso-8859-1] Sat Jun 23 16:09:11 2012
@@ -16,6 +16,8 @@
         set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles"
     ) else if /I "%1" == "Eclipse" (
         set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles"
+    ) else if /I "%1" == "Ninja" (
+        set CMAKE_GENERATOR="Ninja"
     ) else (
         set CMAKE_GENERATOR="MinGW Makefiles"
     )
@@ -106,6 +108,8 @@
         set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles"
     ) else if /I "%1" == "JOM" (
         set CMAKE_GENERATOR="NMake Makefiles JOM"
+    ) else if /I "%1" == "Ninja" (
+        set CMAKE_GENERATOR="Ninja"
     ) else (
         set CMAKE_GENERATOR="NMake Makefiles"
     )