Fix CI. #22
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
||||
cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/$QT_VERSION/mingw81_64/ $CONFIG
|
||||
flags: ''
|
||||
- os: macos-latest
|
||||
cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ $CONFIG
|
||||
cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ -Dfdopen=fdopen $CONFIG
|
||||
flags: -j $(nproc)
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
@@ -157,8 +157,15 @@ list(APPEND VAR_NAMES QT6_INSTALL_PLUGINS)
|
||||
|
||||
# Find Assimp.
|
||||
if(QTK_SUBMODULES)
|
||||
if(APPLE)
|
||||
# Avoid zlib redefining fdopen, causing build failures in apple clang.
|
||||
# https://github.com/assimp/assimp/issues/6118
|
||||
add_compile_definitions(-Dfdopen=fdopen)
|
||||
endif()
|
||||
if(NOT WIN32)
|
||||
add_compile_options(-fPIC)
|
||||
endif()
|
||||
# Required to statically link.
|
||||
add_compile_options(-fPIC)
|
||||
set(BUILD_SHARED_LIBS OFF CACHE STRING "Build static assimp libs" FORCE)
|
||||
set(ASSIMP_BUILD_ZLIB ON CACHE STRING "Build Zlib with assimp." FORCE)
|
||||
set(
|
||||
@@ -175,6 +182,14 @@ if(QTK_SUBMODULES)
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/extern/assimp/assimp/"
|
||||
EXCLUDE_FROM_ALL
|
||||
)
|
||||
install(
|
||||
TARGETS assimp zlibstatic
|
||||
EXPORT qtk_export
|
||||
COMPONENT qtk
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
RUNTIME DESTINATION bin
|
||||
)
|
||||
else()
|
||||
find_package(assimp REQUIRED)
|
||||
endif()
|
||||
|
||||
@@ -90,7 +90,7 @@ The Ubuntu apt repositories contain all the packages we need to build all target
|
||||
To build Qtk desktop application with the scene in the screenshots below run the following commands.
|
||||
|
||||
```bash
|
||||
sudo apt update && sudo apt install cmake build-essential git ccache libxkbcommon-dev libassimp-dev qt6-base-dev qt6-tools-dev
|
||||
sudo apt update && sudo apt install cmake build-essential git ccache libxkbcommon-dev libassimp-dev qt6-base-dev qt6-tools-dev zlib1g-dev
|
||||
cmake -DQTK_GUI_SCENE=ON -B build
|
||||
cmake --build build
|
||||
./build/bin/qtk_gui
|
||||
|
||||
2
extern/assimp/assimp
vendored
2
extern/assimp/assimp
vendored
Submodule extern/assimp/assimp updated: 5d5496f1ad...e0b52347c6
Reference in New Issue
Block a user