Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

This commit is contained in:
Petr Mrázek 2014-01-05 19:41:32 +01:00
commit 9417544ca6

View File

@ -3,6 +3,9 @@ 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") 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")
message("resolving ${resolved_file} as other")
set(${type_var} other PARENT_SCOPE)
endif() endif()
endfunction() endfunction()