diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-05 13:58:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-05 13:58:53 (GMT) |
| commit | 27816fa741560e3668639c0fa054d740de4abc6e (patch) | |
| tree | d0859561902ed72b76204a48c22b2d4f5d0e2e88 /Modules | |
| parent | 741eca9c6ca23258286e074355938fca16702765 (diff) | |
| parent | a3388900f88e2e576d17f635bbf3a7ed257804a3 (diff) | |
| download | CMake-27816fa741560e3668639c0fa054d740de4abc6e.zip CMake-27816fa741560e3668639c0fa054d740de4abc6e.tar.gz CMake-27816fa741560e3668639c0fa054d740de4abc6e.tar.bz2 | |
Merge branch 'csharp_fix_initial_flags' into release-3.9
Merge-request: !1232
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCSharpInformation.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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) |