diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-10 15:30:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-09-29 20:05:53 (GMT) |
| commit | d09b60f563902bd2197d88a3e83b119c09e62428 (patch) | |
| tree | 2465a779918985085c451bd06d43422a2b992f87 /Modules/CMakeFindBinUtils.cmake | |
| parent | 2f071466ebd4e3a416a523ac5f17c84543ff8b3c (diff) | |
| download | CMake-d09b60f563902bd2197d88a3e83b119c09e62428.zip CMake-d09b60f563902bd2197d88a3e83b119c09e62428.tar.gz CMake-d09b60f563902bd2197d88a3e83b119c09e62428.tar.bz2 | |
VS: Detect compiler id of Nsight Tegra-Android toolchains
Teach CMakeDetermineCompilerId to recognize the Tegra-Android platform
and generate a test project for Nsight Tegra tools. Locate the full
path to CMAKE_<LANG>_COMPILER by computing it within the test project
build environment.
Also teach CMakeFindBinUtils that this variant of the Visual Studio
generator uses UNIX-like instead of MS-like archiving and linking tools.
Diffstat (limited to 'Modules/CMakeFindBinUtils.cmake')
| -rw-r--r-- | Modules/CMakeFindBinUtils.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index dda28bd..e0ba131 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -35,7 +35,8 @@ if("${CMAKE_C_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") + 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}) |