Merge commit 'f1fc7e0b63ea694ccb94420a50b3468222a126ea'

This commit is contained in:
Ryan Pavlik
2011-02-18 10:29:40 -06:00
3 changed files with 5 additions and 4 deletions

View File

@@ -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

View File

@@ -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>

View File

@@ -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