Merge pull request #2174 from timothyschoen/cmake-build

Author: porres

.github/workflows/c-cpp.yml

@@ -38,9 +38,9 @@ jobs:
           cmake --build Build
 
       - name: Upload Zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: else
+          name: else-linux
           path: ./Build/else
 
   # ===============================================================
@@ -69,9 +69,9 @@ jobs:
           cmake --build Build
 
       - name: Upload Zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: else
+          name: else-macos
           path: ./Build/else
 
   # ===============================================================
@@ -88,8 +88,17 @@ jobs:
         name: "Install mingw deps"
         uses: msys2/setup-msys2@v2
         with:
-          install: make mingw-w64-x86_64-gcc mingw64/mingw-w64-x86_64-cmake
-          update: false
+          install: make mingw-w64-x86_64-gcc mingw64/mingw-w64-x86_64-cmake mingw64/mingw-w64-x86_64-ccache
+          cache: true
+
+      - name: Restore build cache
+        uses: actions/cache/restore@v4
+        with:
+          path: D:/ccache
+          key: ccache-windows-${{ github.run_id }}
+          restore-keys: |
+            ccache-windows-${{ github.sha }}
+            ccache-windows-
 
       - name: Get Pd
         shell: bash
@@ -102,16 +111,41 @@ jobs:
       - name: Configure pd-else
         shell: msys2 {0}
         run: |
-          cmake -G"MSYS Makefiles" -BBuild -DPD_PATH=./pd
+          cmake -GNinja -BBuild -DPD_PATH=./pd -DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache"
 
       - name: Build pd-else
         shell: msys2 {0}
         run: |
+          export CCACHE_COMPRESS=1
+          export CCACHE_COMPRESSLEVEL=6
+          export CCACHE_MAXSIZE=1G
+          export CCACHE_DIR=D:/ccache
           cmake --build Build
+          ccache -s
           rm -rf ./Build/else/*.a
+        env:
+          CCACHE_COMPRESS: "1"
+          CCACHE_COMPRESSLEVEL: "6"
+          CCACHE_MAXSIZE: "1G"
+          CCACHE_DIR: D:/ccache
+
+      - name: Save build cache
+        uses: actions/cache/save@v4
+        with:
+          path: D:/ccache
+          key: ccache-windows-${{ github.run_id }}
 
       - name: Upload Zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: else
+          name: else-windows
           path: ./Build/else
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: [Windows-Build, macOS-Build, Linux-Build]
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: else

CMakeLists.txt

@@ -87,7 +87,7 @@ file(GLOB tcl_files "${CMAKE_CURRENT_SOURCE_DIR}/Source/Extra/*.tcl")
 file(GLOB abstractions ${CMAKE_CURRENT_SOURCE_DIR}/Abstractions/Audio/*.pd ${CMAKE_CURRENT_SOURCE_DIR}/Abstractions/Control/*.pd ${CMAKE_CURRENT_SOURCE_DIR}/Abstractions/Extra/*)
 file(COPY ${pdf_help} ${extra_files} ${help_files} ${abstractions} ${tcl_files} ${lua_resources} DESTINATION ${PD_OUTPUT_PATH})
 file(COPY ${merda_files} DESTINATION ${PD_OUTPUT_PATH})
-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Source/Audio/sfz~/sfz" DESTINATION ${PD_OUTPUT_PATH}/sfz)
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Source/Audio/sfz~/sfz" DESTINATION ${PD_OUTPUT_PATH})
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Documentation/Live-Electronics-Tutorial" DESTINATION ${PD_OUTPUT_PATH}/Live-Electronics-Tutorial)
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" DESTINATION ${PD_OUTPUT_PATH}/LICENSE)
 file(REMOVE_RECURSE ${PD_OUTPUT_PATH}/audio)

Source/Audio/play.file~/CMakeLists.txt

@@ -18,14 +18,15 @@ set(FFMPEG_LIBS
     "${FFMPEG_OUT_DIR}/libswresample/libswresample.a"
 )
 
+message(STATUS "Configuring ffmpeg")
 execute_process(
     COMMAND tar xjf ./ffmpeg-7.0.1.tar.bz2 -C ${CMAKE_CURRENT_BINARY_DIR}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 add_custom_command(
     OUTPUT ${FFMPEG_LIBS}
-    COMMAND bash -c "${CMAKE_CURRENT_SOURCE_DIR}/build_ffmpeg.sh ${CMAKE_CURRENT_SOURCE_DIR}"
+    COMMAND bash -c "${CMAKE_CURRENT_SOURCE_DIR}/build_ffmpeg.sh ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_C_COMPILER_LAUNCHER}"
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building FFmpeg libraries..."
     VERBATIM

Source/Audio/play.file~/build_ffmpeg.sh

@@ -38,4 +38,4 @@ cd "$FFMPEG_DIR"
             --enable-demuxer=mp3,wav,aiff,flac,aac,ogg,pcm* --enable-filter=aresample --enable-protocol=file \
             $ffmpeg_config
 
-make CC="$ffmpeg_cc"
+make CC="$2 $ffmpeg_cc"

Source/Audio/sfz~/CMakeLists.txt

@@ -35,6 +35,8 @@ set(BASEFLAGS
     "-DSFIZZ_PROFILE_BUILD=OFF"
     "-DSFIZZ_RELEASE_ASSERTS=OFF"
     "-DCMAKE_BUILD_TYPE=Release"
+    "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}"
+    "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}"
 )
 
 message(STATUS "Configuring sfizz")
@@ -43,10 +45,6 @@ execute_process(COMMAND ${CMAKE_COMMAND} .. -G${CMAKE_GENERATOR} ${BASEFLAGS} ${
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sfizz/library/build
 )
 
-add_custom_target(sfizz_build
-    COMMAND ${CMAKE_COMMAND} --build .
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sfizz/library/build
-)
 
 set(SFIZZ_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sfizz/library/build/library/lib)
 
@@ -106,11 +104,28 @@ set(SFIZZ_LIBS
     ${SFIZZ_LIB_DIR}/libaiff.a
 )
 
+add_custom_target(
+    sfizz
+    ALL
+    DEPENDS ${SFIZZ_LIBS}
+)
+
+add_custom_command(
+    OUTPUT ${SFIZZ_LIBS}
+    COMMAND ${CMAKE_COMMAND} --build .
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sfizz/library/build
+    VERBATIM
+)
+
+add_custom_target(sfizz_build
+    DEPENDS ${SFIZZ_LIBS}
+)
+
 add_pd_external(sfz_tilde sfz~ sfz~.c)
 target_link_libraries(sfz_tilde PRIVATE ${SFIZZ_LIBS} else_shared stdc++)
 target_include_directories(sfz_tilde PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/sfizz/library/src)
 target_compile_definitions(sfz_tilde PRIVATE MIDI_CC_COUNT=127 SFIZZ_VERSION="1.2.2")
-add_dependencies(sfz_tilde sfizz_build)
+add_dependencies(sfz_tilde sfizz)
 
 if(UNIX AND NOT APPLE)
     target_link_libraries(sfz_tilde PUBLIC m)