diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-06 14:45:30 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-06 10:46:11 -0400 |
| commit | 932ba44f075718b4e2896ab86a29be7a0fe0fab9 (patch) | |
| tree | 1b02eb02fab95c393fb5298fd51ba40e870c5224 | |
| parent | 70a2a5d1e05683c6be70bbedd6f9dd93556bd458 (diff) | |
| parent | a3388900f88e2e576d17f635bbf3a7ed257804a3 (diff) | |
| download | cmake-932ba44f075718b4e2896ab86a29be7a0fe0fab9.tar.gz | |
Merge topic 'csharp_fix_initial_flags'
a3388900 VS: Initialize CSharp flags consistently
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1232
| -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 b7af4c59b7..978be0a2a9 100644 --- a/Copyright.txt +++ b/Copyright.txt @@ -69,6 +69,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 d474c29418..25f869c9ba 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) |