mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 15:18:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

IRSL: Fix MSVC variable deferencing

Browse Source 
Fixes: #17529
This commit is contained in:
Christian Pfeiffer
2017-12-12 15:15:00 +01:00
parent e2303b257c
commit 4dae55fb70
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/InstallRequiredSystemLibraries.cmake
+7 -2
View File
@@ -56,10 +56,13 @@
# Specify the :command:`install(PROGRAMS)` command ``COMPONENT`` # Specify the :command:`install(PROGRAMS)` command ``COMPONENT``
# option. If not specified, no such option will be used. # option. If not specified, no such option will be used.
cmake_policy(PUSH)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
set(_IRSL_HAVE_Intel FALSE) set(_IRSL_HAVE_Intel FALSE)
set(_IRSL_HAVE_MSVC FALSE) set(_IRSL_HAVE_MSVC FALSE)
foreach(LANG IN ITEMS C CXX Fortran) foreach(LANG IN ITEMS C CXX Fortran)
if(CMAKE_${LANG}_COMPILER_ID STREQUAL Intel) if("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "Intel")
if(NOT _IRSL_HAVE_Intel) if(NOT _IRSL_HAVE_Intel)
get_filename_component(_Intel_basedir "${CMAKE_${LANG}_COMPILER}" PATH) get_filename_component(_Intel_basedir "${CMAKE_${LANG}_COMPILER}" PATH)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -81,7 +84,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
endif() endif()
set(_IRSL_HAVE_Intel TRUE) set(_IRSL_HAVE_Intel TRUE)
endif() endif()
elseif(CMAKE_${LANG}_COMPILER_ID STREQUAL MSVC) elseif("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "MSVC")
set(_IRSL_HAVE_MSVC TRUE) set(_IRSL_HAVE_MSVC TRUE)
endif() endif()
endforeach() endforeach()
@@ -740,3 +743,5 @@ if(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
) )
endif() endif()
endif() endif()
cmake_policy(POP)