summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-06-19 15:27:20 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-06-19 15:27:30 (GMT)
commit622b4dd785e6491c55b87c3a3f23997d66e95988 (patch)
tree07cdc735764d78acdd9dbc11f46ebe27fbadfb6a /Modules
parent7c369ebf03262330bb60d592f18a78f4ac5671db (diff)
parentec7b3af7e74defa608f4cb0debe329614c401635 (diff)
downloadCMake-622b4dd785e6491c55b87c3a3f23997d66e95988.zip
CMake-622b4dd785e6491c55b87c3a3f23997d66e95988.tar.gz
CMake-622b4dd785e6491c55b87c3a3f23997d66e95988.tar.bz2
Merge topic 'vs_csharp_fix_win32manifest_param'
ec7b3af7 Vs: remove /nowin32manifest from C# flags to enable default VS behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !969
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeCSharpInformation.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeCSharpInformation.cmake b/Modules/CMakeCSharpInformation.cmake
index cd86016..d474c29 100644
--- a/Modules/CMakeCSharpInformation.cmake
+++ b/Modules/CMakeCSharpInformation.cmake
@@ -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-")