Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion corpus/cmake-libpalindrome/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.0.0)
cmake_minimum_required (VERSION 3.5.0)
project (libpalindrome C)
add_subdirectory (libpalindrome)
add_subdirectory (palx)
4 changes: 2 additions & 2 deletions dist.ini
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ diag = +Alien::gzip
diag = +IO::Socket::SSL
diag = +Net::SSLeay
diag = +LWP::Protocol::https
diag = +Alien::cmake3
diag = +Alien::cmake4
diag = +Readonly
diag = +Env::ShellWords
diag = +Mojo::DOM58
Expand Down Expand Up @@ -182,7 +182,7 @@ remove = URI::Escape
remove = Archive::Tar
remove = Archive::Zip
remove = Alien::gmake
remove = Alien::cmake3
remove = Alien::cmake4
remove = Devel::Hide
remove = Net::SSLeay
remove = IO::Socket::SSL
Expand Down
2 changes: 1 addition & 1 deletion lib/Alien/Build/Interpolate/Default.pm
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ The C Compiler used to build Perl
Requires: L<Alien::CMake> 0.07 if cmake is not already in C<PATH>.

Deprecated: Use the L<Alien::Build::Plugin::Build::CMake> plugin instead (which will replace
this helper with one that works with L<Alien::cmake3> that works better).
this helper with one that works with L<Alien::cmake4> that works better).

=cut

Expand Down
4 changes: 2 additions & 2 deletions lib/Alien/Build/Manual/FAQ.pod
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ MSYS plugin and use a command sequence to do the build like this:

=head3 CMake

There is an alien L<Alien::cmake3> that provides C<cmake> 3.x or better (It is preferred to the
There is an alien L<Alien::cmake4> that provides C<cmake> 4.x or better (It is preferred to the
older L<Alien::CMake>). Though it is recommended that you use the C<cmake>
(L<Alien::Build::Plugin::Build::CMake>) plugin instead of using L<Alien::cmake3>.
(L<Alien::Build::Plugin::Build::CMake>) plugin instead of using L<Alien::cmake4>.

use alienfile;

Expand Down
6 changes: 3 additions & 3 deletions lib/Alien/Build/Plugin/Build/CMake.pm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Returns true if your Perls C<make> appears to be C<dmake>.

=head2 cmake

This plugin replaces the default C<cmake> helper with the one that comes from L<Alien::cmake3>.
This plugin replaces the default C<cmake> helper with the one that comes from L<Alien::cmake4>.

=head2 cmake_generator

Expand Down Expand Up @@ -119,7 +119,7 @@ sub init
$meta->prop->{destdir} = $^O eq 'MSWin32' ? 0 : 1;

$meta->add_requires('configure' => 'Alien::Build::Plugin::Build::CMake' => '0.99');
$meta->add_requires('share' => 'Alien::cmake3' => '0.02');
$meta->add_requires('share' => 'Alien::cmake4' => '0');

if(is_dmake())
{
Expand Down Expand Up @@ -147,7 +147,7 @@ sub init
}
}

$meta->interpolator->replace_helper('cmake' => sub { require Alien::cmake3; Alien::cmake3->exe });
$meta->interpolator->replace_helper('cmake' => sub { require Alien::cmake4; Alien::cmake4->exe });
$meta->interpolator->add_helper('cmake_generator' => \&cmake_generator);

my @args = (
Expand Down
2 changes: 0 additions & 2 deletions maint/cip-before-install
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ fi

if [ "x$ALIEN_BUILD_INSTALL_EXTRA" == "x1" ]; then

cip exec env PERL_ALT_INSTALL=OVERWRITE cpanm -n Alt::Alien::cmake3::System

cip exec cpanm -n \
Test2::Harness \
File::Listing \
Expand Down
2 changes: 1 addition & 1 deletion t/00_diag.t
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $modules{$_} = $_ for qw(
Acme::Alien::DontPanic
Alien::Base::ModuleBuild
Alien::Libbz2
Alien::cmake3
Alien::cmake4
Alien::gzip
Alien::xz
Archive::Tar
Expand Down
4 changes: 2 additions & 2 deletions t/alien_build_plugin_build_cmake.t
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use Test::Alien::Build;
use Alien::Build::Plugin::Build::CMake;
use Path::Tiny ();

eval { require Alien::cmake3 };
skip_all 'test requires Alien::cmake3' if $@;
eval { require Alien::cmake4 };
skip_all 'test requires Alien::cmake4' if $@;

# To see the actual commands being executed
$ENV{VERBOSE} = 1;
Expand Down
Loading