diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-30 15:29:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-30 15:29:09 (GMT) |
| commit | f640b2a41f9c421f4e29fefaaa6e317d6cd962e0 (patch) | |
| tree | fff98476ef71791ca43c4543cdf27dc52c5644d7 /Modules | |
| parent | 0799b3d8db7920f99ccaf25b4edbf59b8b829678 (diff) | |
| parent | 69fe5920b359398f9618f93e47d199ce889edc23 (diff) | |
| download | CMake-f640b2a41f9c421f4e29fefaaa6e317d6cd962e0.zip CMake-f640b2a41f9c421f4e29fefaaa6e317d6cd962e0.tar.gz CMake-f640b2a41f9c421f4e29fefaaa6e317d6cd962e0.tar.bz2 | |
Merge topic 'cleanup-CMP0054'
69fe5920 GenerateExportHeader: Avoid if() quoted auto-dereference
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GenerateExportHeader.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index f00b577..0c6256c 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -217,9 +217,9 @@ macro(_test_compiler_hidden_visibility) AND NOT _INTEL_TOO_OLD AND NOT WIN32 AND NOT CYGWIN - AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES XL - AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES PGI - AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES Watcom) + AND NOT CMAKE_CXX_COMPILER_ID MATCHES XL + AND NOT CMAKE_CXX_COMPILER_ID MATCHES PGI + AND NOT CMAKE_CXX_COMPILER_ID MATCHES Watcom) check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY) check_cxx_compiler_flag(-fvisibility-inlines-hidden COMPILER_HAS_HIDDEN_INLINE_VISIBILITY) @@ -230,11 +230,11 @@ macro(_test_compiler_hidden_visibility) endmacro() macro(_test_compiler_has_deprecated) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES Borland - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES HP + if(CMAKE_CXX_COMPILER_ID MATCHES Borland + OR CMAKE_CXX_COMPILER_ID MATCHES HP OR GCC_TOO_OLD - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES PGI - OR "${CMAKE_CXX_COMPILER_ID}" MATCHES Watcom) + OR CMAKE_CXX_COMPILER_ID MATCHES PGI + OR CMAKE_CXX_COMPILER_ID MATCHES Watcom) set(COMPILER_HAS_DEPRECATED "" CACHE INTERNAL "Compiler support for a deprecated attribute") else() |