reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-01-19 01:42:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'vs_csharp_fix_win32manifest_param'

Browse Source 
ec7b3af7 Vs: remove /nowin32manifest from C# flags to enable default VS behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !969
This commit is contained in:
Brad King 2017-06-19 15:27:20 +00:00 committed by Kitware Robot
commit 622b4dd785
7 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeCSharpInformation.cmake
View File

@ -10,7 +10,7 @@ get_filename_component(CMAKE_BASE_NAME "${CMAKE_CSharp_COMPILER}" NAME_WE)
set(CMAKE_BUILD_TYPE_INIT Debug)
set(CMAKE_CSharp_FLAGS_INIT "/define:TRACE /langversion:3 /nowin32manifest")
set(CMAKE_CSharp_FLAGS_INIT "/define:TRACE /langversion:3")
set(CMAKE_CSharp_FLAGS_DEBUG_INIT "/debug:full /optimize- /warn:3 /errorreport:prompt /define:DEBUG")
set(CMAKE_CSharp_FLAGS_RELEASE_INIT "/debug:none /optimize /warn:1 /errorreport:queue")
set(CMAKE_CSharp_FLAGS_RELWITHDEBINFO_INIT "/debug:full /optimize-")

3
Source/cmVS10CSharpFlagTable.h
View File

@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS10CSharpFlagTable[] = {
{ "ApplicationIcon", "win32icon", "", "",
cmIDEFlagTable::UserValueRequired },
{ "Win32Manifest", "win32manifest:", "", "true", 0 },
{ "ApplicationManifest", "win32manifest:", "", "",
cmIDEFlagTable::UserValueRequired },
{ "NoWin32Manifest", "nowin32manifest", "", "true", 0 },

3
Source/cmVS11CSharpFlagTable.h
View File

@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS11CSharpFlagTable[] = {
{ "ApplicationIcon", "win32icon", "", "",
cmIDEFlagTable::UserValueRequired },
{ "Win32Manifest", "win32manifest:", "", "true", 0 },
{ "ApplicationManifest", "win32manifest:", "", "",
cmIDEFlagTable::UserValueRequired },
{ "NoWin32Manifest", "nowin32manifest", "", "true", 0 },

3
Source/cmVS12CSharpFlagTable.h
View File

@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS12CSharpFlagTable[] = {
{ "ApplicationIcon", "win32icon", "", "",
cmIDEFlagTable::UserValueRequired },
{ "Win32Manifest", "win32manifest:", "", "true", 0 },
{ "ApplicationManifest", "win32manifest:", "", "",
cmIDEFlagTable::UserValueRequired },
{ "NoWin32Manifest", "nowin32manifest", "", "true", 0 },

3
Source/cmVS140CSharpFlagTable.h
View File

@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS140CSharpFlagTable[] = {
{ "ApplicationIcon", "win32icon", "", "",
cmIDEFlagTable::UserValueRequired },
{ "Win32Manifest", "win32manifest:", "", "true", 0 },
{ "ApplicationManifest", "win32manifest:", "", "",
cmIDEFlagTable::UserValueRequired },
{ "NoWin32Manifest", "nowin32manifest", "", "true", 0 },

3
Source/cmVS141CSharpFlagTable.h
View File

@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS141CSharpFlagTable[] = {
{ "ApplicationIcon", "win32icon", "", "",
cmIDEFlagTable::UserValueRequired },
{ "Win32Manifest", "win32manifest:", "", "true", 0 },
{ "ApplicationManifest", "win32manifest:", "", "",
cmIDEFlagTable::UserValueRequired },
{ "NoWin32Manifest", "nowin32manifest", "", "true", 0 },

6
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -2340,6 +2340,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
clOptions.AddFlag("CallingConvention", "");
}
}
if (csproj == this->ProjectType) {
// /nowin32manifest overrides /win32manifest: parameter
if (clOptions.HasFlag("NoWin32Manifest")) {
clOptions.RemoveFlag("ApplicationManifest");
}
}
this->ClOptions[configName] = pOptions.release();
return true;