mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-11-01 13:12:38 -06:00
Merge branch 'master' into xs
This commit is contained in:
commit
ff795f2918
13 changed files with 175 additions and 60 deletions
26
Build.PL
26
Build.PL
|
|
@ -27,16 +27,28 @@ my %recommends = qw(
|
|||
Class::XSAccessor 0
|
||||
Growl::GNTP 0.15
|
||||
XML::SAX::ExpatXS 0
|
||||
Wx 0.9901
|
||||
);
|
||||
|
||||
# removed:
|
||||
# Wx 0.9901
|
||||
|
||||
my @try = (
|
||||
$ENV{CPANM} // (),
|
||||
File::Spec->catfile($Config{sitebin}, 'cpanm'),
|
||||
File::Spec->catfile($Config{installscript}, 'cpanm'),
|
||||
);
|
||||
|
||||
my $cpanm;
|
||||
if (defined $ENV{CPANM} && -x $ENV{CPANM}) {
|
||||
$cpanm = $ENV{CPANM};
|
||||
} elsif (-x (my $c = File::Spec->catfile($Config{installscript}, 'cpanm'))) {
|
||||
$cpanm = $c;
|
||||
} elsif ($^O = /^(?:darwin|linux)$/ && system(qw(which cpanm)) == 0) {
|
||||
$cpanm = 'cpanm';
|
||||
foreach my $path (@try) {
|
||||
if (-e $path) { # don't use -x because it fails on Windows
|
||||
$cpanm = $path;
|
||||
last;
|
||||
}
|
||||
}
|
||||
if (!$cpanm) {
|
||||
if ($^O =~ /^(?:darwin|linux)$/ && system(qw(which cpanm)) == 0) {
|
||||
$cpanm = 'cpanm';
|
||||
}
|
||||
}
|
||||
die <<'EOF'
|
||||
cpanm was not found. Please install it before running this script.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue