kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cleanup-CMP0054'

Browse Source 
69fe5920 GenerateExportHeader: Avoid if() quoted auto-dereference
This commit is contained in:
Brad King 2014-09-30 11:29:09 -04:00 committed by CMake Topic Stage
commit f640b2a41f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/GenerateExportHeader.cmake
View File

@ -217,9 +217,9 @@ macro(_test_compiler_hidden_visibility)
AND NOT _INTEL_TOO_OLD AND NOT _INTEL_TOO_OLD
AND NOT WIN32 AND NOT WIN32
AND NOT CYGWIN AND NOT CYGWIN
AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES XL AND NOT CMAKE_CXX_COMPILER_ID MATCHES XL
AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES PGI AND NOT CMAKE_CXX_COMPILER_ID MATCHES PGI
AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES Watcom) AND NOT CMAKE_CXX_COMPILER_ID MATCHES Watcom)
check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY) check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
check_cxx_compiler_flag(-fvisibility-inlines-hidden check_cxx_compiler_flag(-fvisibility-inlines-hidden
COMPILER_HAS_HIDDEN_INLINE_VISIBILITY) COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
@ -230,11 +230,11 @@ macro(_test_compiler_hidden_visibility)
endmacro() endmacro()
macro(_test_compiler_has_deprecated) macro(_test_compiler_has_deprecated)
if("${CMAKE_CXX_COMPILER_ID}" MATCHES Borland if(CMAKE_CXX_COMPILER_ID MATCHES Borland
OR "${CMAKE_CXX_COMPILER_ID}" MATCHES HP OR CMAKE_CXX_COMPILER_ID MATCHES HP
OR GCC_TOO_OLD OR GCC_TOO_OLD
OR "${CMAKE_CXX_COMPILER_ID}" MATCHES PGI OR CMAKE_CXX_COMPILER_ID MATCHES PGI
OR "${CMAKE_CXX_COMPILER_ID}" MATCHES Watcom) OR CMAKE_CXX_COMPILER_ID MATCHES Watcom)
set(COMPILER_HAS_DEPRECATED "" CACHE INTERNAL set(COMPILER_HAS_DEPRECATED "" CACHE INTERNAL
"Compiler support for a deprecated attribute") "Compiler support for a deprecated attribute")
else() else()