Merge commit 'bd93e757df13f76a596c865e168ac9b3279a1c9b'

rpavlik · Feb 18, 2011 · 46a935e · 46a935e
2 parents e7d8ff6 + bd93e75
commit 46a935e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/cmake/ResetConfigurations.cmake b/cmake/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/cmake/module-help.html b/cmake/module-help.html
@@ -1344,7 +1344,7 @@ <h2><a name="section_CustomCMakeModules"/>Custom CMake Modules</h2>
 
   </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/cmake/module-help.txt b/cmake/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