diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-24 14:12:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-24 14:12:37 (GMT) |
| commit | 91234717f710c3922a03e8449bf12475b7d6f26b (patch) | |
| tree | 43e84c49530c89090291f98056a3dd55bb3b0764 | |
| parent | 206ce77781d7f19a9877caab137d69cc5ce4bb05 (diff) | |
| parent | fe558718b30da989db8b880374012a0e580574e6 (diff) | |
| download | CMake-91234717f710c3922a03e8449bf12475b7d6f26b.zip CMake-91234717f710c3922a03e8449bf12475b7d6f26b.tar.gz CMake-91234717f710c3922a03e8449bf12475b7d6f26b.tar.bz2 | |
Merge topic 'GetPrerequisites-file-command-update'
fe558718 GetPrerequisites: Update output matching for newer 'file' versions
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index 712a41c..9fb85fe 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -260,6 +260,13 @@ function(is_file_executable file result_var) return() endif() + # "file" version 5.22 does not print "(used shared libraries)" + # but uses "interpreter" + if("${file_ov}" MATCHES "shared object.*interpreter") + set(${result_var} 1 PARENT_SCOPE) + return() + endif() + else() message(STATUS "warning: No 'file' command, skipping execute_process...") endif() |