[ros-diffs] [akhaldi] 48543: [CMAKE] - Now that we have c++ flags set globally, no need to mention them on the respective targets. - debug.h : leftover from the kernel32 sync.
akhaldi at svn.reactos.org
akhaldi at svn.reactos.org
Sat Aug 14 10:47:58 UTC 2010
Author: akhaldi
Date: Sat Aug 14 10:47:57 2010
New Revision: 48543
URL: http://svn.reactos.org/svn/reactos?rev=48543&view=rev
Log:
[CMAKE]
- Now that we have c++ flags set globally, no need to mention them on the respective targets.
- debug.h : leftover from the kernel32 sync.
Modified:
branches/cmake-bringup/include/reactos/debug.h
branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt
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/include/reactos/debug.h
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/debug.h?rev=48543&r1=48542&r2=48543&view=diff
==============================================================================
--- branches/cmake-bringup/include/reactos/debug.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/reactos/debug.h [iso-8859-1] Sat Aug 14 10:47:57 2010
@@ -107,6 +107,11 @@
#define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
+
+ #define ERR__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
+ #define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
+ #define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
+ #define INFO__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#else /* not DBG */
/* On non-debug builds, we never show these */
@@ -119,6 +124,11 @@
#define WARN_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#define TRACE_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#define INFO_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+
+ #define ERR__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+ #define WARN__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+ #define TRACE__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
+ #define INFO__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#endif /* not DBG */
#define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x))
Modified: branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt?rev=48543&r1=48542&r2=48543&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt [iso-8859-1] Sat Aug 14 10:47:57 2010
@@ -6,8 +6,6 @@
add_definitions(-DU_HAVE_INTTYPES_H)
add_definitions(-DUCONFIG_NO_FILE_IO=1)
add_definitions(-DICU_NO_USER_DATA_OVERRIDE=1)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
set(SOURCE
"stubs.cpp"
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=48543&r1=48542&r2=48543&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] Sat Aug 14 10:47:57 2010
@@ -1,8 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
-
-# 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
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=48543&r1=48542&r2=48543&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] Sat Aug 14 10:47:57 2010
@@ -1,8 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
-
-# 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
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=48543&r1=48542&r2=48543&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] Sat Aug 14 10:47:57 2010
@@ -1,8 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
-
-# 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
More information about the Ros-diffs
mailing list