From a3388900f88e2e576d17f635bbf3a7ed257804a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20St=C3=BCrmer?= Date: Mon, 4 Sep 2017 11:58:22 +0200 Subject: VS: Initialize CSharp flags consistently Use the same environment variable for the initial flags that we use for the compiler id. Fixes: #17250 --- Copyright.txt | 1 + Modules/CMakeCSharpInformation.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Copyright.txt b/Copyright.txt index daaa1d1..3320108 100644 --- a/Copyright.txt +++ b/Copyright.txt @@ -68,6 +68,7 @@ The following individuals and institutions are among the Contributors: * Matthaeus G. Chajdas * Matthias Kretz * Matthias Maennich +* Michael Stürmer * Miguel A. Figueroa-Villanueva * Mike Jackson * Mike McQuaid diff --git a/Modules/CMakeCSharpInformation.cmake b/Modules/CMakeCSharpInformation.cmake index cd86016..f71dcef 100644 --- a/Modules/CMakeCSharpInformation.cmake +++ b/Modules/CMakeCSharpInformation.cmake @@ -43,7 +43,7 @@ endif() # on the initial values computed in the platform/*.cmake files # use _INIT variables so that this only happens the first time # and you can set these flags in the cmake cache -set(CMAKE_CSharp_FLAGS_INIT "$ENV{CSharpFLAGS} ${CMAKE_CSharp_FLAGS_INIT}") +set(CMAKE_CSharp_FLAGS_INIT "$ENV{CSFLAGS} ${CMAKE_CSharp_FLAGS_INIT}") # avoid just having a space as the initial value for the cache if(CMAKE_CSharp_FLAGS_INIT STREQUAL " ") set(CMAKE_CSharp_FLAGS_INIT) -- cgit v0.12