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

Fix CI. #22

Merged
shaunrd0 merged 9 commits from fix-ci into main 2026-02-15 01:41:29 +00:00
Conversation 0 Commits 9 Files Changed 6 +2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fe12015d0d - Show all commits

2
.github/workflows/build.yml vendored
View File

@@ -31,7 +31,7 @@ jobs:
cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/$QT_VERSION/mingw81_64/ $CONFIG cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/$QT_VERSION/mingw81_64/ $CONFIG
flags: '' flags: ''
- os: macos-latest - os: macos-latest
cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ -Dfdopen=fdopen $CONFIG cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ $CONFIG
flags: -j $(nproc) flags: -j $(nproc)
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

2
CMakeLists.txt
View File

@@ -163,9 +163,9 @@ if(QTK_SUBMODULES)
add_compile_definitions(-Dfdopen=fdopen) add_compile_definitions(-Dfdopen=fdopen)
endif() endif()
if(NOT WIN32) if(NOT WIN32)
# Required to statically link.
add_compile_options(-fPIC) add_compile_options(-fPIC)
endif() endif()
# Required to statically link.
set(BUILD_SHARED_LIBS OFF CACHE STRING "Build static assimp libs" FORCE) 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(ASSIMP_BUILD_ZLIB ON CACHE STRING "Build Zlib with assimp." FORCE)
set( set(