Merge branch 'master' into tm_builtin_pad

src/CMakeLists.txt

@@ -12,6 +12,7 @@ add_subdirectory(poly2tri)
 add_subdirectory(qhull)
 add_subdirectory(Shiny)
 add_subdirectory(semver)
+add_subdirectory(libigl)
 
 # Adding libnest2d project for bin packing...
 set(LIBNEST2D_UNITTESTS ON CACHE BOOL "Force generating unittests for libnest2d")

src/PrusaSlicer.cpp

@@ -579,7 +579,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
 #endif /* SLIC3R_GUI */
         << std::endl
         << "https://github.com/prusa3d/PrusaSlicer" << std::endl << std::endl
-        << "Usage: slic3r [ ACTIONS ] [ TRANSFORM ] [ OPTIONS ] [ file.stl ... ]" << std::endl
+        << "Usage: prusa-slicer [ ACTIONS ] [ TRANSFORM ] [ OPTIONS ] [ file.stl ... ]" << std::endl
         << std::endl
         << "Actions:" << std::endl;
     cli_actions_config_def.print_cli_help(boost::nowide::cout, false);

src/libigl/CMakeLists.txt

@@ -0,0 +1,14 @@
+project(libigl)
+cmake_minimum_required(VERSION 3.0)
+
+add_library(libigl INTERFACE)
+
+find_package(libigl QUIET)
+
+if(libigl_FOUND)
+    message(STATUS "IGL found, using system version...")
+    target_link_libraries(libigl INTERFACE igl::core)
+else()
+    message(STATUS "IGL NOT found, using bundled version...")
+    target_include_directories(libigl SYSTEM BEFORE INTERFACE ${LIBDIR}/libigl)
+endif()