blob: 6c3668cc213fedab51911088fea1079990248ab4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43d7dee7..7939a767 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,13 +45,13 @@ find_package(Perl REQUIRED)
add_subdirectory(xs)
enable_testing ()
-get_filename_component(PERL_BIN_PATH "${PERL_EXECUTABLE}" DIRECTORY)
-add_test (NAME xs COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs)
-add_test (NAME integration COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+add_test (NAME xs COMMAND prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs)
+add_test (NAME integration COMMAND prove WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
install(PROGRAMS slic3r.pl DESTINATION bin RENAME slic3r-prusa3d)
file(GLOB MyVar var/*.png)
+
install(FILES ${MyVar} DESTINATION share/slic3r-prusa3d)
install(FILES lib/Slic3r.pm DESTINATION lib/slic3r-prusa3d)
install(DIRECTORY lib/Slic3r DESTINATION lib/slic3r-prusa3d)
diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
index 17b78326..92f1842c 100644
--- a/lib/Slic3r.pm
+++ b/lib/Slic3r.pm
@@ -51,7 +51,7 @@ warn "Running Slic3r under Perl 5.16 is neither supported nor recommended\n"
use FindBin;
# Path to the images.
-our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] };
+our $var = sub { decode_path($FindBin::Bin) . "/../share/slic3r-prusa3d/" . $_[0] };
use Moo 1.003001;
diff --git a/slic3r.pl b/slic3r.pl
index 4b6e43e4..d833ed1b 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -5,8 +5,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/lib";
- use local::lib '--no-create', "$FindBin::Bin/local-lib";
+ use lib "$FindBin::Bin/lib", "/usr/lib/slic3r-prusa3d/";
}
use File::Basename qw(basename);
|