[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 8 Jan 2011 20:01:33 +0000 (20:01 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 8 Jan 2011 20:01:33 +0000 (20:01 +0000)
- Prevent cmake from escaping preprocessor definition values added via add_definitions.
- Fix a FIXME in oleaut32 and urlmon builds.

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

CMakeLists.txt
dll/win32/oleaut32/CMakeLists.txt
dll/win32/urlmon/CMakeLists.txt

index ff11971..378babe 100644 (file)
@@ -2,6 +2,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)
 endif()
index 12fb3e3..c641ab0 100644 (file)
@@ -24,9 +24,7 @@ list(APPEND SOURCE
 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__
index 78c0cba..ca1835c 100644 (file)
@@ -66,9 +66,7 @@ add_definitions(
     -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)