From c6afa7d73efc756f9a4cb12763455edd713cbd00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 3 Jan 2016 16:04:26 +0100 Subject: GH-1378 fix libpng path matcher for bundle fixup --- application/install_prereqs.cmake.in | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/application/install_prereqs.cmake.in b/application/install_prereqs.cmake.in index 11c8bbc8..c10882ac 100644 --- a/application/install_prereqs.cmake.in +++ b/application/install_prereqs.cmake.in @@ -2,20 +2,15 @@ set(CMAKE_MODULE_PATH "@CMAKE_MODULE_PATH@") file(GLOB_RECURSE QTPLUGINS "${CMAKE_INSTALL_PREFIX}/@PLUGIN_DEST_DIR@/*@CMAKE_SHARED_LIBRARY_SUFFIX@") function(gp_resolved_file_type_override resolved_file type_var) - if(resolved_file MATCHES "^/usr/lib/libQt") - message("resolving ${resolved_file} as other") + if(resolved_file MATCHES "^/(usr/)?lib/libQt") set(${type_var} other PARENT_SCOPE) - elseif(resolved_file MATCHES "^/usr/lib(.+)?/libxcb") - message("resolving ${resolved_file} as other") + elseif(resolved_file MATCHES "^/(usr/)?lib(.+)?/libxcb") set(${type_var} other PARENT_SCOPE) - elseif(resolved_file MATCHES "^/usr/lib(.+)?/libicu") - message("resolving ${resolved_file} as other") + elseif(resolved_file MATCHES "^/(usr/)?lib(.+)?/libicu") set(${type_var} other PARENT_SCOPE) - elseif(resolved_file MATCHES "^/usr/lib(.+)?/libpng") - message("resolving ${resolved_file} as other") + elseif(resolved_file MATCHES "^/(usr/)?lib(.+)?/libpng") set(${type_var} other PARENT_SCOPE) - elseif((resolved_file MATCHES "^/usr/lib(.+)?/libstdc\\+\\+") AND (UNIX AND NOT APPLE)) - message("resolving ${resolved_file} as other") + elseif((resolved_file MATCHES "^/(usr/)?lib(.+)?/libstdc\\+\\+") AND (UNIX AND NOT APPLE)) set(${type_var} other PARENT_SCOPE) endif() endfunction() -- cgit v1.2.3