shaunrd0
/
qtk
1
1
Fork 0
Code Issues 9 Pull Requests 1 Actions Projects Releases Wiki Activity

Don't build assimp from source in CI

This commit is contained in:
Shaun Reed 2022-08-14 18:17:05 -04:00
parent 5f6608e1d8
commit e85f872d39
2 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.github/workflows/build-test.yml vendored
View File

@ -15,59 +15,19 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
cmake: -DCMAKE_PREFIX_PATH="/home/runner/work/qtk/Qt/6.3.1/gcc_64/;../assimp" cmake: -DCMAKE_PREFIX_PATH="/home/runner/work/qtk/Qt/6.3.1/gcc_64/;../assimp"
- os: windows-latest - os: windows-latest
cmake: -DCMAKE_PREFIX_PATH="D:/a/qtk/qtk/Qt/6.3.1/mingw81_64/;../assimp" -DASSIMP_NEW_INTERFACE=on cmake: -DCMAKE_PREFIX_PATH="D:/a/qtk/qtk/Qt/6.3.1/mingw81_64/" -DASSIMP_NEW_INTERFACE=on
- os: macos-latest - os: macos-latest
cmake: -DCMAKE_PREFIX_PATH="/home/runner/work/qtk/Qt/6.3.1/gcc_64/;../assimp" -DASSIMP_NEW_INTERFACE=on cmake: -DCMAKE_PREFIX_PATH="/home/runner/work/qtk/Qt/6.3.1/gcc_64/" -DASSIMP_NEW_INTERFACE=on
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Clone Assimp
uses: actions/checkout@v3
with:
repository: 'assimp/assimp'
path: 'assimp'
- name: Build Assimp
shell: bash
run: |
pwd
ls
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
# if: matrix.os == 'ubuntu-latest'
# shell: bash
# run: |
# sudo apt install libassimp-dev -y
#
# - name: Install Assimp MacOS
# if: matrix.os == 'macos-latest'
# shell: bash
# run: |
# brew install assimp
#
# - name: Install Assimp Windows
# if: matrix.os == 'windows-latest'
# shell: bash
# run: |
# git clone https://github.com/Microsoft/vcpkg.git
# cd vcpkg
# ./bootstrap-vcpkg.sh
# ./vcpkg integrate install
# 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: |

3
CMakeLists.txt
View File

@ -22,12 +22,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Qtk build options # Qtk build options
option(QTK_DEBUG "Enable debugger" ON) option(QTK_DEBUG "Enable debugger" ON)
option(BUILD_SHARED_LIBS "Build shared library" ON) option(BUILD_SHARED_LIBS "Build shared library" ON)
option(UPDATE_SUBMODULES "Update external project (assimp) git submodule" ON)
# Qt options # Qt options
set(QT_DIR "$ENV{HOME}/Code/Clones/Qt/6.3.1/gcc_64/" CACHE PATH "Path to Qt6") set(QT_DIR "$ENV{HOME}/Code/Clones/Qt/6.3.1/gcc_64/" CACHE PATH "Path to Qt6")
# Options for bringing your own assimp installation; Otherwise not needed # Options for bringing your own assimp installation; Otherwise not needed
# + If assimp is available system-wide we can just set UPDATE_SUBMODULES OFF
option(UPDATE_SUBMODULES "Update external project (assimp) git submodule" ON)
set(ASSIMP_DIR "" CACHE PATH "Path to local installation of assimp") set(ASSIMP_DIR "" CACHE PATH "Path to local installation of assimp")
option(ASSIMP_NEW_INTERFACE "Use the assimp::assimp interface (WIN / OSX)" OFF) option(ASSIMP_NEW_INTERFACE "Use the assimp::assimp interface (WIN / OSX)" OFF)