0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1378 fix libpng path matcher for bundle fixup

Browse Source
This commit is contained in:
Petr Mrázek 2016-01-03 16:04:26 +01:00
parent dcb4e0fa6f
commit c6afa7d73e
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/install_prereqs.cmake.in
View File

@ -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@") file(GLOB_RECURSE QTPLUGINS "${CMAKE_INSTALL_PREFIX}/@PLUGIN_DEST_DIR@/*@CMAKE_SHARED_LIBRARY_SUFFIX@")
function(gp_resolved_file_type_override resolved_file type_var) function(gp_resolved_file_type_override resolved_file type_var)
if(resolved_file MATCHES "^/usr/lib/libQt") if(resolved_file MATCHES "^/(usr/)?lib/libQt")
message("resolving ${resolved_file} as other")
set(${type_var} other PARENT_SCOPE) set(${type_var} other PARENT_SCOPE)
elseif(resolved_file MATCHES "^/usr/lib(.+)?/libxcb") elseif(resolved_file MATCHES "^/(usr/)?lib(.+)?/libxcb")
message("resolving ${resolved_file} as other")
set(${type_var} other PARENT_SCOPE) set(${type_var} other PARENT_SCOPE)
elseif(resolved_file MATCHES "^/usr/lib(.+)?/libicu") elseif(resolved_file MATCHES "^/(usr/)?lib(.+)?/libicu")
message("resolving ${resolved_file} as other")
set(${type_var} other PARENT_SCOPE) set(${type_var} other PARENT_SCOPE)
elseif(resolved_file MATCHES "^/usr/lib(.+)?/libpng") elseif(resolved_file MATCHES "^/(usr/)?lib(.+)?/libpng")
message("resolving ${resolved_file} as other")
set(${type_var} other PARENT_SCOPE) set(${type_var} other PARENT_SCOPE)
elseif((resolved_file MATCHES "^/usr/lib(.+)?/libstdc\\+\\+") AND (UNIX AND NOT APPLE)) elseif((resolved_file MATCHES "^/(usr/)?lib(.+)?/libstdc\\+\\+") AND (UNIX AND NOT APPLE))
message("resolving ${resolved_file} as other")
set(${type_var} other PARENT_SCOPE) set(${type_var} other PARENT_SCOPE)
endif() endif()
endfunction() endfunction()