From bba1ffd927e887253225802834cfef30496e9869 Mon Sep 17 00:00:00 2001 From: Sir Richard Date: Tue, 27 Jul 2010 16:07:39 +0000 Subject: [PATCH] [CMAKE]: Watch and learn, Amine... svn path=/branches/cmake-bringup/; revision=48311 --- lib/nls/idna/CMakeLists.txt | 7 ++++++- lib/nls/normalize/CMakeLists.txt | 7 ++++++- lib/nls/scripts/CMakeLists.txt | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lib/nls/idna/CMakeLists.txt b/lib/nls/idna/CMakeLists.txt index 4a69585b0a4..a7435a7595f 100644 --- a/lib/nls/idna/CMakeLists.txt +++ b/lib/nls/idna/CMakeLists.txt @@ -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") diff --git a/lib/nls/normalize/CMakeLists.txt b/lib/nls/normalize/CMakeLists.txt index 4abc7833622..31197368da5 100644 --- a/lib/nls/normalize/CMakeLists.txt +++ b/lib/nls/normalize/CMakeLists.txt @@ -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") diff --git a/lib/nls/scripts/CMakeLists.txt b/lib/nls/scripts/CMakeLists.txt index 04fae8b3f05..b79be4c1468 100644 --- a/lib/nls/scripts/CMakeLists.txt +++ b/lib/nls/scripts/CMakeLists.txt @@ -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")