[ros-diffs] [akhaldi] 50333: [CMAKE] - Prevent cmake from escaping preprocessor definition values added via add_definitions. - Fix a FIXME in oleaut32 and urlmon builds.

Author: akhaldi
Date: Sat Jan  8 20:01:33 2011
New Revision: 50333

URL: http://svn.reactos.org/svn/reactos?rev=50333&view=rev
Log:
[CMAKE]
- Prevent cmake from escaping preprocessor definition values added via add_definitions.
- Fix a FIXME in oleaut32 and urlmon builds.

Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt

Modified: branches/cmake-bringup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re…
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Jan  8 20:01:33 2011
@@ -1,6 +1,9 @@
 
 cmake_minimum_required(VERSION 2.6)
 project(REACTOS)
+
+# Don't escape preprocessor definition values added via add_definitions
+cmake_policy(SET CMP0005 OLD)
 
 if(NOT ARCH)
     set(ARCH i386)

Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3…
==============================================================================
--- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Sat Jan  8
20:01:33 2011
@@ -24,9 +24,7 @@
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-#FIXME: this should be quotes enclosed
-add_definitions(-DPROXY_CLSID_IS={0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}})
-#add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}")
+add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}")
 
 add_definitions(
     -D__WINESRC__

Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/…
==============================================================================
--- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Sat Jan  8
20:01:33 2011
@@ -66,9 +66,7 @@
     -DREGISTER_PROXY_DLL
     -D_URLMON_)
 
-# FIXME : this should be quotes enclosed 
-add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}})
-#add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}")
+add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}")
 
 add_cab_target(urlmon 1)
 add_importlib_target(urlmon.spec)