diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-01 13:12:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-01 13:12:42 (GMT) |
| commit | 0479ae492a6bc6058ae86d3ce01ac26fcc71c744 (patch) | |
| tree | c6122361c2fb9a233b86f8159020c9e6a1f3d723 /Modules/Platform | |
| parent | a906d7b41c8ff2656f3fa3dc5765be79ba31166a (diff) | |
| parent | 1293ed8507be7e854dcb9437a5b7062ec740ff69 (diff) | |
| download | CMake-0479ae492a6bc6058ae86d3ce01ac26fcc71c744.zip CMake-0479ae492a6bc6058ae86d3ce01ac26fcc71c744.tar.gz CMake-0479ae492a6bc6058ae86d3ce01ac26fcc71c744.tar.bz2 | |
Merge topic 'implicit-incs-cleanup'
1293ed8507 ParseImplicitIncludeInfo: keep implicit incl. consistent when rerunning cmake
eaf53158f4 CrayPrgEnv/ParseImplicitIncludes: simplify for new implict include parser
ef8f237686 ParseImplicitIncludeInfo: add SunPro Fortran and PGI compiler, Cray fix
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2894
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/UnixPaths.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake index fc22fce..4ae4514 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake @@ -69,14 +69,17 @@ list(APPEND CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES ) # Default per-language values. These may be later replaced after -# parsing the implicit link directories from compiler output. -list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +# parsing the implicit directory information from compiler output. +set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT + ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} /usr/include ) -list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT + ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} /usr/include ) -list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES +set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT + ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES} /usr/include ) |