diff options
| author | Michael Stürmer <michael.stuermer@schaeffler.com> | 2017-09-04 11:58:22 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-05 09:58:43 -0400 |
| commit | a3388900f88e2e576d17f635bbf3a7ed257804a3 (patch) | |
| tree | 3591905ca1de82a38193355ae4854a9915b25e65 | |
| parent | fca4423786ba2c4a5ab0ec6c1a1cbac8cd8600b4 (diff) | |
| download | cmake-a3388900f88e2e576d17f635bbf3a7ed257804a3.tar.gz | |
VS: Initialize CSharp flags consistently
Use the same environment variable for the initial flags that we
use for the compiler id.
Fixes: #17250
| -rw-r--r-- | Copyright.txt | 1 | ||||
| -rw-r--r-- | Modules/CMakeCSharpInformation.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Copyright.txt b/Copyright.txt index daaa1d1a13..33201080dc 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 <kretz@kde.org> * Matthias Maennich <matthias@maennich.net> +* Michael Stürmer * Miguel A. Figueroa-Villanueva * Mike Jackson * Mike McQuaid <mike@mikemcquaid.com> diff --git a/Modules/CMakeCSharpInformation.cmake b/Modules/CMakeCSharpInformation.cmake index cd86016270..f71dcefe96 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) |