From e103a6dbe611a6a638988c7e369f0ce7d9919a75 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Sat, 3 Apr 2021 11:44:00 -0500
Subject: [PATCH] clang-tidy cleanup: llvm-include-order

---
 CMakeLists.txt               | 32 ++++++++++++++++++++++++-
 src/slic3r/GUI/MainFrame.cpp | 46 ++++++++++++++++++------------------
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 274ffcc73..239876188 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ endif ()
 
 # Proposal for C++ unit tests and sandboxes
 option(SLIC3R_BUILD_SANDBOXES   "Build development sandboxes" OFF)
-option(SLIC3R_BUILD_TESTS       "Build unit tests" ON)
+option(SLIC3R_BUILD_TESTS       "Build unit tests" OFF)
 
 # Print out the SLIC3R_* cache options
 get_cmake_property(_cache_vars CACHE_VARIABLES)
@@ -528,3 +528,33 @@ else ()
 endif ()
 
 configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp)
+
+if (WIN32)
+else () 
+    set(CPACK_GENERATOR "STGZ;TGZ;TZ")
+    set(CPACK_NSIS_DISPLAY_NAME "Slic3r 2.0")
+    set(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/cmake/CPackConfig.cmake")
+    set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake is a build tool")
+    set(CPACK_PACKAGE_EXECUTABLES "Slic3r")
+    set(CPACK_PACKAGE_FILE_NAME "slic3r-2.0-Linux-x86_64")
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "Slic3r 2.0")
+    set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Slic3r 2.0.0")
+    set(CPACK_PACKAGE_NAME "Slic3r")
+    set(CPACK_PACKAGE_VENDOR "Slic3r")
+    set(CPACK_PACKAGE_VERSION "2.0.0")
+    set(CPACK_PACKAGE_VERSION_MAJOR "2")
+    set(CPACK_PACKAGE_VERSION_MINOR "0")
+    set(CPACK_PACKAGE_VERSION_PATCH "0")
+    set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+    set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+    set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+    set(CPACK_SOURCE_GENERATOR "TGZ;TZ")
+    set(CPACK_SOURCE_PACKAGE_FILE_NAME "Slic3r-2.0.0")
+    set(CPACK_SOURCE_STRIP_FILES "")
+    set(CPACK_STRIP_FILES "bin/Slic3r")
+    set(CPACK_SYSTEM_NAME "Linux-x86_64")
+    set(CPACK_TOPLEVEL_TAG "Linux-x86_64")
+endif()
+
+include(CPack)
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index c295c17a6..9cb3ac3ae 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -1,37 +1,37 @@
 #include "MainFrame.hpp"
 
-#include <wx/panel.h>
-#include <wx/notebook.h>
-#include <wx/icon.h>
-#include <wx/sizer.h>
-#include <wx/menu.h>
-#include <wx/progdlg.h>
-#include <wx/tooltip.h>
-//#include <wx/glcanvas.h>
-#include <wx/filename.h>
 #include <wx/debug.h>
+#include <wx/filename.h>
+//#include <wx/glcanvas.h>
+#include <wx/icon.h>
+#include <wx/menu.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/progdlg.h>
+#include <wx/sizer.h>
+#include <wx/tooltip.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 
-#include "libslic3r/Print.hpp"
 #include "libslic3r/Polygon.hpp"
-#include "libslic3r/SLAPrint.hpp"
 #include "libslic3r/PresetBundle.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/SLAPrint.hpp"
 
-#include "Tab.hpp"
-#include "ProgressStatusBar.hpp"
-#include "3DScene.hpp"
-#include "PrintHostDialogs.hpp"
-#include "wxExtensions.hpp"
-#include "GUI_ObjectList.hpp"
-#include "Mouse3DController.hpp"
-#include "RemovableDriveManager.hpp"
-#include "InstanceCheck.hpp"
-#include "I18N.hpp"
-#include "GLCanvas3D.hpp"
-#include "Plater.hpp"
 #include "../Utils/Process.hpp"
+#include "3DScene.hpp"
+#include "GLCanvas3D.hpp"
+#include "GUI_ObjectList.hpp"
+#include "I18N.hpp"
+#include "InstanceCheck.hpp"
+#include "Mouse3DController.hpp"
+#include "Plater.hpp"
+#include "PrintHostDialogs.hpp"
+#include "ProgressStatusBar.hpp"
+#include "RemovableDriveManager.hpp"
+#include "Tab.hpp"
 #include "format.hpp"
+#include "wxExtensions.hpp"
 
 #include <fstream>
 #include <string_view>