From 69fe5920b359398f9618f93e47d199ce889edc23 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 29 Sep 2014 15:53:13 -0400 Subject: GenerateExportHeader: Avoid if() quoted auto-dereference When testing CMAKE_CXX_COMPILER_ID values with if(MATCHES), do not explicitly dereference or quote CMAKE_CXX_COMPILER_ID. We want if() to auto-dereference the variable and not its value. --- Modules/GenerateExportHeader.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Modules/GenerateExportHeader.cmake') diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index f00b577b4b..0c6256cf7f 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() -- cgit v1.2.1