Merge commit 'f1fc7e0b63ea694ccb94420a50b3468222a126ea'
This commit is contained in:
@@ -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:
|
# Requires these CMake modules:
|
||||||
# no additional modules required
|
# no additional modules required
|
||||||
@@ -21,7 +21,7 @@ endif()
|
|||||||
set(__reset_configurations YES)
|
set(__reset_configurations YES)
|
||||||
|
|
||||||
if(CMAKE_CONFIGURATION_TYPES)
|
if(CMAKE_CONFIGURATION_TYPES)
|
||||||
set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release")
|
set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug")
|
||||||
set(CMAKE_CONFIGURATION_TYPES
|
set(CMAKE_CONFIGURATION_TYPES
|
||||||
"${CMAKE_CONFIGURATION_TYPES}"
|
"${CMAKE_CONFIGURATION_TYPES}"
|
||||||
CACHE
|
CACHE
|
||||||
|
|||||||
@@ -1344,7 +1344,7 @@
|
|||||||
|
|
||||||
</li>
|
</li>
|
||||||
<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><br /></p>
|
||||||
<p>Requires these CMake modules:<br /></p>
|
<p>Requires these CMake modules:<br /></p>
|
||||||
<pre> no additional modules required<br /></pre>
|
<pre> no additional modules required<br /></pre>
|
||||||
|
|||||||
@@ -3272,7 +3272,8 @@ a few.
|
|||||||
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
|
||||||
ResetConfigurations
|
ResetConfigurations
|
||||||
Re-set the available configurations to just RelWithDebInfo and Release
|
Re-set the available configurations to just RelWithDebInfo, Release,
|
||||||
|
and Debug
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user