GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 07:11:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3737 from alexrj/allow-unversioned-boost-libs

Browse Source 
Permit boost libraries to not have the version # in their name
This commit is contained in:
Alessandro Ranellucci 2017-03-05 02:17:53 +01:00 committed by GitHub
commit a7f1cd50ab
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xs/Build.PL
View File

@ -98,11 +98,9 @@ if (defined $ENV{BOOST_LIBRARYDIR}) {
qw(/opt/local/lib /usr/local/lib /opt/lib /usr/lib /lib); qw(/opt/local/lib /usr/local/lib /opt/lib /usr/lib /lib);
} }
} }
# In order to generate the -l switches we need to know how Boost libraries are named # In order to generate the -l switches we need to know how Boost libraries are named
my $have_boost = 0; my $have_boost = 0;
my @boost_libraries = qw(system thread filesystem); # we need these my @boost_libraries = qw(system thread filesystem); # we need these
# check without explicit lib path (works on Linux) # check without explicit lib path (works on Linux)
if (! $mswin) { if (! $mswin) {
$have_boost = 1 $have_boost = 1
@ -122,8 +120,8 @@ if (!$ENV{SLIC3R_STATIC} && $have_boost) {
# Try to find the boost system library. # Try to find the boost system library.
my @files = glob "$path/${lib_prefix}system*$lib_ext"; my @files = glob "$path/${lib_prefix}system*$lib_ext";
next if !@files; next if !@files;
if ($files[0] =~ /${lib_prefix}system([^.]+)$lib_ext$/) { if ($files[0] =~ /${lib_prefix}system([^.]*)$lib_ext$/) {
# Suffix contains the version number, the build type etc. # Suffix contains the version number, the build type etc.
my $suffix = $1; my $suffix = $1;
# Verify existence of all required boost libraries at $path. # Verify existence of all required boost libraries at $path.