Code cleaning

.github/workflows/ccpp_mac.yml

@@ -1,12 +1,7 @@
 name: C/C++ Nightly macos
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
-      - debug_macos
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_mac_arm.yml

@@ -1,12 +1,7 @@
 name: C/C++ Nightly arm macos
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
-      - debug_macos
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_mac_arm_debug.yml

@@ -1,9 +1,7 @@
 name: C/C++ debug arm macos
 
 on:
-  push:
-    branches:
-      - debug_macos
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_mac_arm_rc.yml

@@ -1,9 +1,7 @@
 name: C/C++ Release candidate arm macos
 
 on:
-  push:
-    branches:
-      - rc
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_mac_debug.yml

@@ -1,9 +1,7 @@
 name: C/C++ debug macos
 
 on:
-  push:
-    branches:
-      - debug_macos
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_mac_rc.yml

@@ -1,10 +1,7 @@
 name: C/C++ Release candidate macos
 
 on:
-  push:
-    branches:
-      - rc
-      - debug_macos
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_ubuntu.yml

@@ -1,12 +1,7 @@
 name: C/C++ Nightly ubuntu
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
-      - debug_ubuntu
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_ubuntu_debug.yml

@@ -1,9 +1,7 @@
 name: C/C++ debug ubuntu
 
 on:
-  push:
-    branches:
-      - debug_ubuntu
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_ubuntu_gtk3.yml

@@ -1,12 +1,7 @@
 name: C/C++ Nightly ubuntu-GTK3
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
-      - debug_ubuntu
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_ubuntu_gtk3_debug.yml

@@ -1,9 +1,7 @@
 name: C/C++ debug ubuntu-GTK3
 
 on:
-  push:
-    branches:
-      - debug_ubuntu
+  workflow_dispatch:
 
 jobs:
   build:
@@ -47,4 +45,4 @@ jobs:
       with:
         name: ${{ github.event.repository.name }}-gtk3.AppImage
         path: build/${{ github.event.repository.name }}_ubu64.AppImage
-        
+

.github/workflows/ccpp_ubuntu_gtk3_rc.yml

@@ -1,9 +1,7 @@
 name: C/C++ Release candidate ubuntu-GTK3
 
 on:
-  push:
-    branches:
-      - rc
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_ubuntu_rc.yml

@@ -1,9 +1,7 @@
 name: C/C++ Release candidate ubuntu
 
 on:
-  push:
-    branches:
-      - rc
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/ccpp_win.yml

@@ -1,17 +1,13 @@
 name: C/C++ Nightly windows x64
 
 on:
-  push:
-    branches:
-      - Nigthly
-      - nightly_dev
-      - nightly_master
+  workflow_dispatch:
 
 jobs:
 
   build:
     runs-on: windows-2019
-    
+
     steps:
     - uses: actions/checkout@v1
     - uses: ilammy/msvc-dev-cmd@v1

.github/workflows/ccpp_win_debug.yml

@@ -1,15 +1,13 @@
 name: C/C++ debug windows x64
 
 on:
-  push:
-    branches:
-      - debug_win
+  workflow_dispatch:
 
 jobs:
 
   build_pot:
     runs-on: windows-2019
-    
+
     steps:
     - uses: actions/checkout@v1
     - uses: ilammy/msvc-dev-cmd@v1
@@ -77,7 +75,7 @@ jobs:
   build:
     runs-on: windows-2019
     needs: build_dep
-    
+
     steps:
     - uses: actions/checkout@v1
     - uses: ilammy/msvc-dev-cmd@v1

.github/workflows/ccpp_win_deps.yml

@@ -1,9 +1,7 @@
 name: C/C++ dep build windows x64
 
 on:
-  push:
-    branches:
-      - debug_win
+  workflow_dispatch:
 
 jobs:
   build_dep:
@@ -28,7 +26,7 @@ jobs:
   build:
     runs-on: windows-2019
     needs: build_dep
-    
+
     steps:
     - uses: actions/checkout@v1
     - uses: ilammy/msvc-dev-cmd@v1

.github/workflows/ccpp_win_rc.yml

@@ -1,15 +1,13 @@
 name: C/C++ Release candidate windows x64
 
 on:
-  push:
-    branches:
-      - rc
+  workflow_dispatch:
 
 jobs:
 
   build:
     runs-on: windows-2019
-    
+
     steps:
     - uses: actions/checkout@v1
     - uses: ilammy/msvc-dev-cmd@v1

.gitignore

@@ -18,6 +18,7 @@ local-lib
 build*
 deps/build*
 deps/deps-*
+cmake/CPackConfig.cmake
 
 # MacOS Ignores
 .DS_Store

BuildLinux.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export ROOT=`pwd`
-export NCORES=`nproc --all`
+export NCORES=`nproc`
 FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
 FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
 

src/CMakeLists.txt

@@ -93,7 +93,7 @@ if (SLIC3R_GUI)
         list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX expat)
         list(APPEND wxWidgets_LIBRARIES libexpat)
     endif ()
-    
+
     # This is an issue in the new wxWidgets cmake build, doesn't deal with librt
     find_library(LIBRT rt)
     if(LIBRT)
@@ -176,10 +176,10 @@ target_link_libraries(Slic3r libslic3r_gui)
     endif ()
     if (WIN32)
         find_library(PSAPI_LIB NAMES Psapi)
-		if(NOT PSAPI_LIB)
+        if(NOT PSAPI_LIB)
             message("WARNING: Psapi can't be find, trying again with hint to ${CMAKE_WINDOWS_KITS_10_DIR}/Lib/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um/x64")
-			find_library(PSAPI_LIB Psapi PATH "${CMAKE_WINDOWS_KITS_10_DIR}/Lib/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um/x64")
-		endif()
+            find_library(PSAPI_LIB Psapi PATH "${CMAKE_WINDOWS_KITS_10_DIR}/Lib/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um/x64")
+        endif()
         target_link_libraries(Slic3r ${PSAPI_LIB})
     endif ()
 endif ()
@@ -190,7 +190,7 @@ if (WIN32)
     if (MINGW)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode")
     endif()
-	
+
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libslic3r/libslic3r_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h @ONLY)
 
     add_executable(Slic3r_app_gui WIN32 PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/${SLIC3R_APP_KEY}.rc)
@@ -216,7 +216,7 @@ if (WIN32)
     target_link_libraries(Slic3r_app_console PRIVATE boost_headeronly)
 
     add_executable(PrusaSlicer_app_gcodeviewer WIN32 PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/${SLIC3R_APP_KEY}-gcodeviewer.rc ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h)
-	target_include_directories(PrusaSlicer_app_gcodeviewer PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+    target_include_directories(PrusaSlicer_app_gcodeviewer PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
     # Generate debug symbols even in release mode.
     if (MSVC)
         target_link_options(PrusaSlicer_app_gcodeviewer PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
@@ -287,7 +287,7 @@ else ()
     endif ()
      add_custom_command(TARGET Slic3r POST_BUILD
         # COMMAND ln -sfn "${SLIC3R_RESOURCES_DIR}" "${BIN_RESOURCES_DIR}" # make[3]: stat: src/Slic3r: Too many levels of symbolic links
-		 COMMAND cp -r "${SLIC3R_RESOURCES_DIR}" "${BIN_RESOURCES_DIR}"
+         COMMAND cp -r "${SLIC3R_RESOURCES_DIR}" "${BIN_RESOURCES_DIR}"
          COMMENT "Symlinking the resources directory into the build tree"
          VERBATIM)
 endif ()