CMake and Build System Overhaul

.devcontainer/devcontainer.json

@@ -1,7 +1,6 @@
 {
 	"name": "OrcaSlicer",
 	"image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04",
-	"runArgs": ["--env-file", "/tmp/devcontainer.env"],
     "features": {
         "ghcr.io/devcontainers/features/desktop-lite:1": {
 			"password": "orca"
@@ -11,14 +10,7 @@
 		"vscode": {
 			"settings": { 
 				"cmake.configureArgs": [
-					"-DSLIC3R_GTK=3",
-					"-DBBL_RELEASE_TO_PUBLIC=1",
-					"-DBBL_INTERNAL_TESTING=0",
-					"-DSLIC3R_STATIC=1",
-					"-DCMAKE_PREFIX_PATH=${workspaceFolder}/deps/build/destdir/usr/local"
-				],
-				"cmake.buildToolArgs": [
-					"-l${containerEnv:CORES}"
+					"-DBUILD_DEPS=ON"
 				]
 			},
 
@@ -41,9 +33,6 @@
 		"onAutoForward": "ignore"
 	},
 
-	"initializeCommand": {
-		"Setup Temporary Env File": "echo \"CORES=`nproc --all`\" > /tmp/devcontainer.env"
-	},
 	"onCreateCommand": {
 		"Set postCreate executable flag": "chmod +x .devcontainer/postCreate.sh"
 	},

.github/workflows/build_check_cache.yml

@@ -32,11 +32,10 @@ jobs:
         env:
           underscore-arch: ${{ inputs.os == 'macos-14' && '_' || ''}}${{ inputs.os == 'macos-14' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing
           dash-arch: ${{ inputs.os == 'macos-14' && '-' || ''}}${{ inputs.os == 'macos-14' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing
-          dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-14') && 'OrcaSlicer_dep' || 'destdir' }}
           output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
         run: |
           echo cache-key=${{ inputs.os }}${{ env.dash-arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
-          echo cache-path=${{ github.workspace }}/deps/build${{ env.underscore-arch }}/${{ env.dep-folder-name }}${{ env.underscore-arch }} >> ${{ env.output-cmd }}
+          echo cache-path=${{ github.workspace }}/deps/build${{ env.underscore-arch }}/OrcaSlicer_dep${{ env.underscore-arch }} >> ${{ env.output-cmd }}
 
       - name: load cache
         id: cache_deps

.github/workflows/build_deps.yml

@@ -66,20 +66,15 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: |
             choco install strawberryperl
-            mkdir ${{ github.workspace }}/deps/build
-            mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
             .\build_release_vs2022.bat deps
             .\build_release_vs2022.bat pack
-            cd ${{ github.workspace }}/deps/build
 
       - name: Build on Mac ${{ inputs.arch }}
         if: inputs.os == 'macos-14'
         working-directory: ${{ github.workspace }}
         run: |
             brew install automake texinfo ninja libtool
             brew list
-            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
-            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep_${{ inputs.arch }}
             brew uninstall --ignore-dependencies zstd
             ./build_release_macos.sh -dpx -a ${{ inputs.arch }} -t 10.15 -1
             brew install zstd
@@ -103,14 +98,9 @@ jobs:
         if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
         working-directory: ${{ github.workspace }}
         run: |
-            mkdir -p ${{ github.workspace }}/deps/build
-            mkdir -p ${{ github.workspace }}/deps/build/destdir
             sudo ./BuildLinux.sh -ur
             sudo chown $USER -R ./
-            ./BuildLinux.sh -dr
-            cd deps/build
-            tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
-
+            ./BuildLinux.sh -drp
 
       # Upload Artifacts
       - name: Upload Mac ${{ inputs.arch }} artifacts

.github/workflows/build_orca.yml

@@ -83,8 +83,6 @@ jobs:
         run: |
           brew install tree ninja libtool
           brew list
-          mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}
-          mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
           tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
 
       - name: Build slicer mac

.gitignore

@@ -1,7 +1,7 @@
 Build
 Build.bat
 /build*/
-deps/build*
+/deps/build*/
 MYMETA.json
 MYMETA.yml
 _build
@@ -13,15 +13,12 @@ MANIFEST.bak
 xs/MANIFEST.bak
 xs/assertlib*
 .init_bundle.ini
-.vs/*
+.vs/
 local-lib
 /src/TAGS
 /.vscode/
-build-linux/*
-deps/build*/*
 **/.DS_Store
 install_*
-build_*/
 SVG
 src/OrcaSlicer-doc/
 .idea/
@@ -30,8 +27,7 @@ src/OrcaSlicer-doc/
 **/process_full/
 **/machine_full/
 **/filament_full/
-/deps/DL_CACHE/
-/deps/DL_CACHE
+DL_CACHE
 **/.flatpak-builder/
 resources/profiles/user/default
 *.code-workspace

BuildLinux.sh

@@ -27,47 +27,62 @@ function check_available_memory_and_disk() {
 function usage() {
     echo "Usage: ./BuildLinux.sh [-1][-b][-c][-d][-i][-r][-s][-u]"
     echo "   -1: limit builds to 1 core (where possible)"
-    echo "   -b: build in debug mode"
+    echo "   -b: build in Debug mode"
+    echo "   -B: build in RelWithDebInfo mode"
     echo "   -c: force a clean build"
     echo "   -d: build deps (optional)"
     echo "   -h: this help output"
     echo "   -i: Generate appimage (optional)"
+    echo "   -p: Pack dependencies (optional)"
     echo "   -r: skip ram and disk checks (low ram compiling)"
     echo "   -s: build orca-slicer (optional)"
     echo "   -u: update and build dependencies (optional and need sudo)"
     echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
     echo "   and then './BuildLinux.sh -dsi'"
 }
 
+BUILD_DIR="build"
+BUILD_TYPE="Release"
 unset name
-while getopts ":1bcdghirsu" opt; do
+while getopts ":1bBcdhiprsu" opt; do
   case ${opt} in
     1 )
         export CMAKE_BUILD_PARALLEL_LEVEL=1
         ;;
     b )
-        BUILD_DEBUG="1"
+        BUILD_DIR="build-debug"
+        BUILD_TYPE="Debug"
+        ;;
+    B )
+        BUILD_DIR="build-debinfo"
+        BUILD_TYPE="RelWithDebInfo"
         ;;
     c )
-        CLEAN_BUILD=1
+        CLEAN_BUILD="1"
         ;;
     d )
         BUILD_DEPS="1"
         ;;
-    h ) usage
+    h )
+        usage
         exit 0
         ;;
     i )
         BUILD_IMAGE="1"
         ;;
+    p )
+        PACK_DEPS="1"
+        ;;
     r )
 	    SKIP_RAM_CHECK="1"
-	;;
+	    ;;
     s )
         BUILD_ORCA="1"
         ;;
     u )
-        UPDATE_LIB="1"
+        export UPDATE_LIB="1"
+        ;;
+    * )
         ;;
   esac
 done
@@ -104,7 +119,6 @@ echo "Changing date in version..."
     # change date in version
     sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
 }
-echo "done"
 
 
 if ! [[ -n "${SKIP_RAM_CHECK}" ]]
@@ -115,30 +129,14 @@ fi
 if [[ -n "${BUILD_DEPS}" ]]
 then
     echo "Configuring dependencies..."
-    BUILD_ARGS="-DDEP_WX_GTK3=ON"
     if [[ -n "${CLEAN_BUILD}" ]]
     then
-        rm -fr deps/build
-    fi
-    if [ ! -d "deps/build" ]
-    then
-        mkdir deps/build
-    fi
-    if [[ -n "${BUILD_DEBUG}" ]]
-    then
-        # have to build deps with debug & release or the cmake won't find everything it needs
-        if [ ! -d "deps/build/release" ]
-        then
-            mkdir deps/build/release
-        fi
-        cmake -S deps -B deps/build/release -G Ninja -DDESTDIR="${PWD}/deps/build/destdir" -DDEP_DOWNLOAD_DIR="${PWD}/deps/DL_CACHE" ${BUILD_ARGS}
-        cmake --build deps/build/release
-        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
+        rm -fr deps/${BUILD_DIR}
     fi
 
-    echo "cmake -S deps -B deps/build -G Ninja ${BUILD_ARGS}"
-    cmake -S deps -B deps/build -G Ninja ${BUILD_ARGS}
-    cmake --build deps/build
+    echo "cmake -S deps -B deps/${BUILD_DIR} -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE}"
+    cmake -S deps -B deps/${BUILD_DIR} -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+    cmake --build deps/${BUILD_DIR}
 fi
 
 
@@ -147,46 +145,43 @@ then
     echo "Configuring OrcaSlicer..."
     if [[ -n "${CLEAN_BUILD}" ]]
     then
-        rm -fr build
-    fi
-    BUILD_ARGS=""
-    if [[ -n "${FOUND_GTK3_DEV}" ]]
-    then
-        BUILD_ARGS="-DSLIC3R_GTK=3"
+        rm -fr ${BUILD_DIR}
     fi
-    if [[ -n "${BUILD_DEBUG}" ]]
-    then
-        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1"
-    else
-        BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0"
-    fi
-    echo -e "cmake -S . -B build -G Ninja -DCMAKE_PREFIX_PATH="${PWD}/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}"
-    cmake -S . -B build -G Ninja \
-        -DCMAKE_PREFIX_PATH="${PWD}/deps/build/destdir/usr/local" \
-        -DSLIC3R_STATIC=1 \
-        -DORCA_TOOLS=ON \
-        ${BUILD_ARGS}
-    echo "done"
+    echo -e "cmake -S . -B ${BUILD_DIR} -G Ninja -DORCA_TOOLS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE}"
+    cmake -S . -B ${BUILD_DIR} -G Ninja -DORCA_TOOLS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+
     echo "Building OrcaSlicer ..."
-    cmake --build build --target OrcaSlicer
+    cmake --build ${BUILD_DIR} --target OrcaSlicer
+
     echo "Building OrcaSlicer_profile_validator .."
-    cmake --build build --target OrcaSlicer_profile_validator
+    cmake --build ${BUILD_DIR} --target OrcaSlicer_profile_validator
+
     ./run_gettext.sh
-    echo "done"
 fi
 
-if [[ -e ${ROOT}/build/src/BuildLinuxImage.sh ]]; then
+if [[ -n "${PACK_DEPS}" ]]
+then
+    echo "Packing dependencies..."
+    if [ -d "deps/${BUILD_DIR}/OrcaSlicer_dep" ]; then
+        cd deps/${BUILD_DIR}
+        tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz OrcaSlicer_dep
+    else
+        echo "The deps destination directory does not exist"
+        echo "Targeted destination directory: $(pwd)/deps/${BUILD_DIR}/OrcaSlicer_dep"
+    fi
+fi
+
+if [[ -e ${ROOT}/${BUILD_DIR}/src/BuildLinuxImage.sh ]]; then
 # Give proper permissions to script
-chmod 755 ${ROOT}/build/src/BuildLinuxImage.sh
+chmod 755 ${ROOT}/${BUILD_DIR}/src/BuildLinuxImage.sh
 
-echo "[9/9] Generating Linux app..."
-    pushd build
+echo "Generating Linux app..."
+    pushd ${BUILD_DIR}
         if [[ -n "${BUILD_IMAGE}" ]]
         then
-            ${ROOT}/build/src/BuildLinuxImage.sh -i
+            ${ROOT}/${BUILD_DIR}/src/BuildLinuxImage.sh -i
         else
-            ${ROOT}/build/src/BuildLinuxImage.sh
+            ${ROOT}/${BUILD_DIR}/src/BuildLinuxImage.sh
         fi
     popd
-echo "done"
 fi