Skip to content

Commit

Permalink
VS: Initialize CSharp flags consistently
Browse files Browse the repository at this point in the history
Use the same environment variable for the initial flags that we
use for the compiler id.

Fixes: #17250
  • Loading branch information
micst authored and bradking committed Sep 5, 2017
1 parent fca4423 commit a338890
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Copyright.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Modules/CMakeCSharpInformation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a338890

Please sign in to comment.