[ros-diffs] [akhaldi] 60190: [CMAKE] * Add a proper way to enable/disable PSEH3.

Author: akhaldi
Date: Tue Sep 17 22:31:33 2013
New Revision: 60190

URL: http://svn.reactos.org/svn/reactos?rev=60190&view=rev
Log:
[CMAKE]
* Add a proper way to enable/disable PSEH3.

Modified:
    trunk/reactos/CMakeLists.txt
    trunk/reactos/cmake/config.cmake
    trunk/reactos/cmake/gcc.cmake
    trunk/reactos/lib/pseh/CMakeLists.txt

Modified: trunk/reactos/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=60190&am...
==============================================================================
--- trunk/reactos/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/CMakeLists.txt	[iso-8859-1] Tue Sep 17 22:31:33 2013
@@ -127,10 +127,6 @@

if(_WINKD_)
         add_definitions(-D_WINKD_=1)
-    endif()
-
-    if(USE_PSEH3)
-        add_definitions(-D_USE_PSEH3=1)
     endif()

# Version Options

Modified: trunk/reactos/cmake/config.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=6019...
==============================================================================
--- trunk/reactos/cmake/config.cmake	[iso-8859-1] (original)
+++ trunk/reactos/cmake/config.cmake	[iso-8859-1] Tue Sep 17 22:31:33 2013
@@ -71,15 +71,8 @@
 "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()

Modified: trunk/reactos/cmake/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=60190&a...
==============================================================================
--- trunk/reactos/cmake/gcc.cmake	[iso-8859-1] (original)
+++ trunk/reactos/cmake/gcc.cmake	[iso-8859-1] Tue Sep 17 22:31:33 2013
@@ -7,6 +7,14 @@
 # PDB style debug info
 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

Modified: trunk/reactos/lib/pseh/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?rev...
==============================================================================
--- trunk/reactos/lib/pseh/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/lib/pseh/CMakeLists.txt	[iso-8859-1] Tue Sep 17 22:31:33 2013
@@ -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