diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-27 17:53:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-27 17:53:28 (GMT) |
| commit | 74b9538c2661f406e25dad364faf0cf7a7dbda84 (patch) | |
| tree | eeaddbe647f145838b3788a89921b6355454b7fe /Modules | |
| parent | 9e3aee952dacc52c94e34a8d76b60c1e797f0533 (diff) | |
| parent | e4e6b63ec96dc4a51fc336efd28e5f2b3f8d455f (diff) | |
| download | CMake-74b9538c2661f406e25dad364faf0cf7a7dbda84.zip CMake-74b9538c2661f406e25dad364faf0cf7a7dbda84.tar.gz CMake-74b9538c2661f406e25dad364faf0cf7a7dbda84.tar.bz2 | |
Merge topic 'extra-gen-fix-0'
e4e6b63ec9 Extra Generator: Fix extraction of macros with value 0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2308
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake index 3a72622..55e0373 100644 --- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake +++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake @@ -66,10 +66,10 @@ macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines #message(STATUS "m1: -${CMAKE_MATCH_1}- m2: -${CMAKE_MATCH_2}- m3: -${CMAKE_MATCH_3}-") list(APPEND ${_resultDefines} "${_name}") - if(_value) - list(APPEND ${_resultDefines} "${_value}") - else() + if ("${_value}" STREQUAL "") list(APPEND ${_resultDefines} " ") + else() + list(APPEND ${_resultDefines} "${_value}") endif() endforeach() |