[ros-diffs] [sir_richard] 48311: [CMAKE]: Watch and learn, Amine...

[sir_richard at svn.reactos.org]

Author: sir_richard
Date: Tue Jul 27 16:07:39 2010
New Revision: 48311

URL: http://svn.reactos.org/svn/reactos?rev=48311&view=rev
Log:
[CMAKE]: Watch and learn, Amine...

Modified:
    branches/cmake-bringup/lib/nls/idna/CMakeLists.txt
    branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt
    branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt

Modified: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/idna/CMakeLists.txt?rev=48311&r1=48310&r2=48311&view=diff
==============================================================================
--- branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] Tue Jul 27 16:07:39 2010
@@ -1,7 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti")
+# Special C++ flags
+add_definitions(-fno-exceptions -fno-rtti)
+
+# Re-definition of WINVER
+remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line
+add_definitions(-DWINVER=0x600) # And now we add our own
 
 file(GLOB_RECURSE SOURCE "*.cpp")
 

Modified: branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt?rev=48311&r1=48310&r2=48311&view=diff
==============================================================================
--- branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] Tue Jul 27 16:07:39 2010
@@ -1,7 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti")
+# Special C++ flags
+add_definitions(-fno-exceptions -fno-rtti)
+
+# Re-definition of WINVER
+remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line
+add_definitions(-DWINVER=0x600) # And now we add our own
 
 file(GLOB_RECURSE SOURCE "*.cpp")
 

Modified: branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt?rev=48311&r1=48310&r2=48311&view=diff
==============================================================================
--- branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] Tue Jul 27 16:07:39 2010
@@ -1,7 +1,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti")
+# Special C++ flags
+add_definitions(-fno-exceptions -fno-rtti)
+
+# Re-definition of WINVER
+remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line
+add_definitions(-DWINVER=0x600) # And now we add our own
 
 file(GLOB_RECURSE SOURCE "*.cpp")