diff options
author | Alessandro Ranellucci <aar@cpan.org> | 2015-11-01 21:12:13 +0300 |
---|---|---|
committer | Alessandro Ranellucci <aar@cpan.org> | 2015-11-01 21:12:13 +0300 |
commit | 9b21ac877adb4f768fcfb268dfc3384dd6fb3efc (patch) | |
tree | c5525e2ebbd38bcd45b3c51f58853f056cd94a6d /Build.PL | |
parent | e58c32bee87cd7b4286f46d1a897f06d9f24f871 (diff) | |
parent | 2811af349ae17230a525ddcf819b1ddffaa250c9 (diff) |
Merge branch 'master' into sender
Conflicts:
Build.PL
lib/Slic3r.pm
xs/MANIFEST
xs/src/libslic3r/PrintConfig.hpp
Diffstat (limited to 'Build.PL')
-rw-r--r-- | Build.PL | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -8,7 +8,8 @@ use File::Spec; my %prereqs = qw( Devel::CheckLib 0 - Encode::Locale 0 + Encode 0 + Encode::Locale 1.05 ExtUtils::MakeMaker 6.80 ExtUtils::ParseXS 3.22 File::Basename 0 @@ -24,6 +25,7 @@ my %prereqs = qw( IO::Scalar 0 threads 1.96 Time::HiRes 0 + Unicode::Normalize 0 ); my %recommends = qw( Class::XSAccessor 0 @@ -119,7 +121,11 @@ EOF foreach my $module (sort keys %modules) { my $version = $modules{$module}; my @cmd = ($cpanm, @cpanm_args); - push @cmd, '--notest', if $module eq 'OpenGL'; # temporary workaround for upstream bug in test + + # temporary workaround for upstream bug in test + push @cmd, '--notest' + if $module =~ /^(?:OpenGL|Math::PlanePath|Test::Harness)$/; + push @cmd, "$module~$version"; if ($module eq 'XML::SAX::ExpatXS' && $^O eq 'MSWin32') { my $mingw = 'C:\dev\CitrusPerl\mingw64'; |