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 66039ddf..bb7e1eb5 100644 --- a/lib/Slic3r.pm +++ b/lib/Slic3r.pm @@ -41,7 +41,7 @@ warn "Running Slic3r under Perl 5.16 is neither supported nor recommended\n" use FindBin; # Let the XS module know where the GUI resources reside. -set_resources_dir(decode_path($FindBin::Bin) . (($^O eq 'darwin') ? '/../Resources' : '/resources')); +set_resources_dir("/usr/share/slic3r-prusa3d"); set_var_dir(resources_dir() . "/icons"); 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);