From 17be07fb6047b0d231e0f9e9942cf6034c44b683 Mon Sep 17 00:00:00 2001 From: rjindael Date: Wed, 19 Jul 2023 15:30:28 -0700 Subject: [PATCH] moar CI fixes --- .github/workflows/build.yml | 5 +++-- CMakeLists.txt | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0768a8c..e3b3567 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,9 +19,9 @@ jobs: - name: Install required packages uses: awalsh128/cache-apt-pkgs-action@latest with: - version: 2.1 + version: 3.0 packages: >- - build-essential + clang cmake ninja-build libboost-dev @@ -31,6 +31,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: + arch: clang_64 version: 6.* cache: true diff --git a/CMakeLists.txt b/CMakeLists.txt index d52826e..8dc6607 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,4 +17,10 @@ find_package(Boost REQUIRED) find_package(OGRE REQUIRED COMPONENTS Bites CONFIG) find_package(pugixml REQUIRED) -add_subdirectory(Projects) \ No newline at end of file +add_subdirectory(Projects) + +if(CI AND UNIX) + file(COPY ${OGRE_MEDIA_DIR}/ShadowVolume/ DESTINATION ${CMAKE_BINARY_DIR}/shaders) + file(COPY ${OGRE_MEDIA_DIR}/RTShaderLib/ DESTINATION ${CMAKE_BINARY_DIR}/shaders) + file(COPY ${OGRE_PLUGIN_DIR}/ DESTINATION ${CMAKE_BINARY_DIR}/plugins) +endif() \ No newline at end of file