Merge branch 'backport-fix-CMP0054-MSVC' into release
This commit is contained in:
commit
b1e7fe9e8d
|
@ -30,12 +30,12 @@
|
|||
# License text for the above reference.)
|
||||
|
||||
# if it's the MS C/CXX compiler, search for link
|
||||
if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC"
|
||||
OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC"
|
||||
OR "${CMAKE_Fortran_SIMULATE_ID}" STREQUAL "MSVC"
|
||||
OR "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC"
|
||||
OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"
|
||||
OR ("${CMAKE_GENERATOR}" MATCHES "Visual Studio"
|
||||
if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
|
||||
OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC"
|
||||
OR "x${CMAKE_Fortran_SIMULATE_ID}" STREQUAL "xMSVC"
|
||||
OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC"
|
||||
OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
|
||||
OR (CMAKE_GENERATOR MATCHES "Visual Studio"
|
||||
AND NOT CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android"))
|
||||
|
||||
find_program(CMAKE_LINKER NAMES link HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
include(Compiler/Clang)
|
||||
__compiler_clang(CXX)
|
||||
|
||||
if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
|
||||
if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
|
||||
set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
|
||||
endif()
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
include(Compiler/Clang)
|
||||
__compiler_clang(CXX)
|
||||
|
||||
if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
|
||||
if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
|
||||
set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
|
||||
endif()
|
||||
|
||||
|
|
|
@ -18,8 +18,8 @@ if(__COMPILER_CLANG)
|
|||
endif()
|
||||
set(__COMPILER_CLANG 1)
|
||||
|
||||
if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC"
|
||||
OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
|
||||
if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
|
||||
OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
|
||||
macro(__compiler_clang lang)
|
||||
endmacro()
|
||||
else()
|
||||
|
|
|
@ -18,8 +18,8 @@ if(__WINDOWS_CLANG)
|
|||
endif()
|
||||
set(__WINDOWS_CLANG 1)
|
||||
|
||||
if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC"
|
||||
OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
|
||||
if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
|
||||
OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
|
||||
include(Platform/Windows-MSVC)
|
||||
macro(__windows_compiler_clang lang)
|
||||
__windows_compiler_msvc(${lang})
|
||||
|
|
Loading…
Reference in New Issue