From 166e5a03d63e0b522876bfc072f26f213d5a3a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 22 Jan 2018 04:28:07 +0100 Subject: NOISSUE rearrange build system * Added install commands to the libraries instead of force installing files * Most of the application cmake stuff moved to top level * RPATH should now be set/cleared correctly * Contains a fix for GH-1780 --- cmake/BundleUtilities.cmake | 2 +- cmake/GetPrerequisites.cmake | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/BundleUtilities.cmake b/cmake/BundleUtilities.cmake index 0f6cd059..e3f50b94 100644 --- a/cmake/BundleUtilities.cmake +++ b/cmake/BundleUtilities.cmake @@ -301,7 +301,7 @@ function(get_bundle_and_executable app bundle_var executable_var valid_var) endif() endif() else() - message(STATUS "warning: *NOT* handled - directory/file does not exist...") + message(STATUS "warning: *NOT* handled - directory/file ${app} does not exist...") endif() if(NOT valid) diff --git a/cmake/GetPrerequisites.cmake b/cmake/GetPrerequisites.cmake index d782ced9..39c2cc63 100644 --- a/cmake/GetPrerequisites.cmake +++ b/cmake/GetPrerequisites.cmake @@ -205,6 +205,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() -- cgit v1.2.3