diff --git a/.gitea/workflows/build_pc.yml b/.gitea/workflows/build_pc.yml index 4f049f8..2da5da6 100644 --- a/.gitea/workflows/build_pc.yml +++ b/.gitea/workflows/build_pc.yml @@ -36,13 +36,13 @@ jobs: && sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin - name: Get cmake checks from cache - uses: actions/cache/restore@v3 + uses: actions/cache@v4 id: cache with: path: | ${{github.workspace}}/build/cmake_checks_cache.txt ${{github.workspace}}/build/CMakeFiles/**/CMake*.cmake - key: ${{runner.os}}-cmakeChecks + key: ${{runner.os}}-cmake-checks - name: Configure CMake shell: bash @@ -83,19 +83,6 @@ jobs: if-no-files-found: error retention-days: 30 overwrite: true - - name: Cache cmake checks - if: steps.cache.outputs.cache-hit != 'true' - id: cache-cmake-checks - uses: actions/cache/save@v3 - with: - path: | - ${{github.workspace}}/build/cmake_checks_cache.txt - ${{github.workspace}}/build/CMakeFiles/**/CMake*.cmake - key: ${{runner.os}}-cmakeChecks - - - - build_iOS: diff --git a/openVulkanoCpp/CMakeLists.txt b/openVulkanoCpp/CMakeLists.txt index ae726bb..8ed12cd 100644 --- a/openVulkanoCpp/CMakeLists.txt +++ b/openVulkanoCpp/CMakeLists.txt @@ -15,7 +15,6 @@ if ("${BASH_EXECUTABLE}" STREQUAL "") find_program(BASH_PROGRAM bash NO_CACHE REQUIRED) set(BASH_EXECUTABLE ${BASH_PROGRAM} CACHE FILEPATH "Path to bash executable" FORCE) endif() -message("Using bash exe ${BASH_EXECUTABLE}") # go from openVulkano/OpenVulkanoCpp to openVulkano cmake_path(GET CMAKE_CURRENT_SOURCE_DIR PARENT_PATH ROOT_FOLDER) set(SCRIPT_FOLDER "${ROOT_FOLDER}/Scripts")