Compare commits

..

2 Commits

Author SHA1 Message Date
Shaun Reed 432bf9919c Work on Windows CI 2022-08-06 15:18:55 -04:00
Shaun Reed 52521dc331 Add MacOS CI
+ (@-OgreTransporter) Merge patches from #4
2022-08-06 15:09:59 -04:00
1 changed files with 28 additions and 23 deletions

View File

@ -35,35 +35,40 @@ jobs:
pwd pwd
ls ls
cmake -S assimp/ -B assimp/build/ -DCMAKE_INSTALL_PREFIX=../assimp && cmake --build assimp/build cmake -S assimp/ -B assimp/build/ -DCMAKE_INSTALL_PREFIX=../assimp && cmake --build assimp/build
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: '6.3.1' version: '6.3.1'
# - name: Install Assimp Linux # - name: Install Assimp Linux
# if: matrix.os == 'ubuntu-latest' # if: matrix.os == 'ubuntu-latest'
# shell: bash # shell: bash
# run: | # run: |
# sudo apt install libassimp-dev -y # sudo apt install libassimp-dev -y
# #
# - name: Install Assimp MacOS # - name: Install Assimp MacOS
# if: matrix.os == 'macos-latest' # if: matrix.os == 'macos-latest'
# shell: bash # shell: bash
# run: | # run: |
# brew install assimp # brew install assimp
# #
# - name: Install Assimp Windows # - name: Install Assimp Windows
# if: matrix.os == 'windows-latest' # if: matrix.os == 'windows-latest'
# shell: bash # shell: bash
# run: | # run: |
# git clone https://github.com/Microsoft/vcpkg.git # git clone https://github.com/Microsoft/vcpkg.git
# cd vcpkg # cd vcpkg
# ./bootstrap-vcpkg.sh # ./bootstrap-vcpkg.sh
# ./vcpkg integrate install # ./vcpkg integrate install
# vcpkg install assimp # vcpkg install assimp
- name: Install Assimp MacOS
if: matrix.os == 'macos-latest'
shell: bash
run: |
brew install assimp
- name: Build Qtk - name: Build Qtk
shell: bash shell: bash
run: | run: |
cmake -S . -B build/ ${{ matrix.cmake }} && cmake --build build/ cmake -S . -B build/ ${{ matrix.cmake }} && cmake --build build/