diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-23 15:19:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-11-23 15:19:34 (GMT) |
| commit | 5e3045a749b34fb87c876af9a42ee190d722bada (patch) | |
| tree | 365f6a089cbe7c0ee445e7f75c36f165703edb4c /Modules/CMakeDetermineCompilerId.cmake | |
| parent | e3dfa3506c0589cb4c3e91107e560c2495cdc257 (diff) | |
| parent | 9682de566e264c53018cccd05465f2c5d91ccf73 (diff) | |
| download | CMake-5e3045a749b34fb87c876af9a42ee190d722bada.zip CMake-5e3045a749b34fb87c876af9a42ee190d722bada.tar.gz CMake-5e3045a749b34fb87c876af9a42ee190d722bada.tar.bz2 | |
Merge branch 'revert-compiler-links-statically' into release
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 2e74100..81c2509 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -106,7 +106,6 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) set(MSVC_${lang}_ARCHITECTURE_ID "${MSVC_${lang}_ARCHITECTURE_ID}" PARENT_SCOPE) set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX}" PARENT_SCOPE) - set(CMAKE_${lang}_COMPILER_LINKS_STATICALLY "${CMAKE_${lang}_COMPILER_LINKS_STATICALLY}" PARENT_SCOPE) set(CMAKE_${lang}_COMPILER_VERSION "${CMAKE_${lang}_COMPILER_VERSION}" PARENT_SCOPE) set(CMAKE_${lang}_SIMULATE_ID "${CMAKE_${lang}_SIMULATE_ID}" PARENT_SCOPE) set(CMAKE_${lang}_SIMULATE_VERSION "${CMAKE_${lang}_SIMULATE_VERSION}" PARENT_SCOPE) @@ -533,13 +532,6 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file) endif() endif() - if(UNIX) - execute_process(COMMAND file "${file}" OUTPUT_VARIABLE out ERROR_VARIABLE out) - if(out MATCHES "statically linked") - set(CMAKE_${lang}_COMPILER_LINKS_STATICALLY 1 PARENT_SCOPE) - endif() - endif() - # Check if a valid compiler and platform were found. if(COMPILER_ID AND NOT COMPILER_ID_TWICE) set(CMAKE_${lang}_COMPILER_ID "${COMPILER_ID}") |