From f1fc7e0b63ea694ccb94420a50b3468222a126ea Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri, 18 Feb 2011 10:29:40 -0600
Subject: [PATCH] Squashed 'cmake/' changes from 93c492f..6de4a61

6de4a61 Re-enable the debug configuration

git-subtree-dir: cmake
git-subtree-split: 6de4a61eadc174cbebf088dfa87c348758f20a2f
---
 ResetConfigurations.cmake | 4 ++--
 module-help.html          | 2 +-
 module-help.txt           | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ResetConfigurations.cmake b/ResetConfigurations.cmake
index abf625b..8c13fdf 100644
--- a/ResetConfigurations.cmake
+++ b/ResetConfigurations.cmake
@@ -1,4 +1,4 @@
-# - Re-set the available configurations to just RelWithDebInfo and Release
+# - Re-set the available configurations to just RelWithDebInfo, Release, and Debug
 #
 # Requires these CMake modules:
 #  no additional modules required
@@ -21,7 +21,7 @@ endif()
 set(__reset_configurations YES)
 
 if(CMAKE_CONFIGURATION_TYPES)
-	set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release")
+	set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug")
 	set(CMAKE_CONFIGURATION_TYPES
 		"${CMAKE_CONFIGURATION_TYPES}"
 		CACHE
diff --git a/module-help.html b/module-help.html
index a71ce20..83201b3 100644
--- a/module-help.html
+++ b/module-help.html
@@ -1344,7 +1344,7 @@
 
   </li>
   <li>
-    <a name="module:ResetConfigurations"><b><code>ResetConfigurations</code></b></a>: Re-set the available configurations to just RelWithDebInfo and Release<br />
+    <a name="module:ResetConfigurations"><b><code>ResetConfigurations</code></b></a>: Re-set the available configurations to just RelWithDebInfo, Release, and Debug<br />
     <p><br /></p>
 <p>Requires these CMake modules:<br /></p>
 <pre>  no additional modules required<br /></pre>
diff --git a/module-help.txt b/module-help.txt
index dcd7ed7..5bccc1d 100644
--- a/module-help.txt
+++ b/module-help.txt
@@ -3272,7 +3272,8 @@ a few.
        LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
   ResetConfigurations
-       Re-set the available configurations to just RelWithDebInfo and Release
+       Re-set the available configurations to just RelWithDebInfo, Release,
+       and Debug