[CMAKE]

* Add a proper way to enable/disable PSEH3.

svn path=/trunk/; revision=60190

diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt
index df6bd7b..16c2f6d 100644 (file)
--- a/reactos/CMakeLists.txt
+++ b/reactos/CMakeLists.txt
@@ -129,10 +129,6 @@ else()
         add_definitions(-D_WINKD_=1)
     endif()
 
-    if(USE_PSEH3)
-        add_definitions(-D_USE_PSEH3=1)
-    endif()
-
     # Version Options
     add_definitions(-DWINVER=0x502
                     -D_WIN32_IE=0x600

diff --git a/reactos/cmake/config.cmake b/reactos/cmake/config.cmake
index d3619a5..9dd983b 100644 (file)
--- a/reactos/cmake/config.cmake
+++ b/reactos/cmake/config.cmake
@@ -71,15 +71,8 @@ set(GENERATE_DEPENDENCY_GRAPH FALSE CACHE BOOL
 "Whether to create a graphml dependency of dlls.")
 
 if(MSVC)
-
 set(_PREFAST_ FALSE CACHE BOOL
 "Whether to enable PREFAST while compiling.")
 set(_VS_ANALYZE_ FALSE CACHE BOOL
 "Whether to enable static analysis while compiling.")
-
-else()
-
-set(USE_PSEH3 FALSE CACHE BOOL
-"Whether to use the new PSEH3 library (requires GCC 4.5 and newer).")
-
 endif()

diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake
index 4c38727..669ffe6 100644 (file)
--- a/reactos/cmake/gcc.cmake
+++ b/reactos/cmake/gcc.cmake
@@ -9,6 +9,14 @@ if(NOT DEFINED SEPARATE_DBG)
     set(SEPARATE_DBG FALSE)
 endif()
 
+if(NOT DEFINED USE_PSEH3)
+    set(USE_PSEH3 0)
+endif()
+
+if(USE_PSEH3)
+    add_definitions(-D_USE_PSEH3=1)
+endif()
+
 # Compiler Core
 add_compile_flags("-pipe -fms-extensions -fno-strict-aliasing")
 if(GCC_VERSION VERSION_GREATER 4.7)

diff --git a/reactos/lib/pseh/CMakeLists.txt b/reactos/lib/pseh/CMakeLists.txt
index d58e089..5e960e1 100644 (file)
--- a/reactos/lib/pseh/CMakeLists.txt
+++ b/reactos/lib/pseh/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 if(NOT MSVC)
 
-    if (USE_PSEH3)
+    if(USE_PSEH3)
         include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/pseh)
         list(APPEND SOURCE
             i386/pseh3.c