Skip to content

Commit

Permalink
vtool
Browse files Browse the repository at this point in the history
  • Loading branch information
Be-ing committed Jan 30, 2024
1 parent 92baeff commit 5f56f98
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/github-cxx-qt-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ jobs:
env:
# Match the deployment target that Qt was built with via vcpkg, otherwise the following error occurs
# ld: warning: object file (LIB) was built for newer macOS version (12.7) than being linked (12.0)
MACOSX_DEPLOYMENT_TARGET: 12.7
# MACOSX_DEPLOYMENT_TARGET: 12.7
# sccache is around 250-350M in size for a normal build
# set the cache size to double of this to leave some headroom
# but don't expand too large as we cache old data and cause cache evictions
Expand Down Expand Up @@ -291,6 +291,9 @@ jobs:
working-directory: ${{ matrix.workspace }}
env:
RUSTC_WRAPPER: sccache
- name: "vtool"
run: vtool -show-build build/examples/qml_features/example_qml_features
if: runner.os == 'macOS'
- name: "Test"
run: ctest ${{ matrix.ctest_args }} -C Release -T test --output-on-failure --parallel ${{ matrix.cores }}
working-directory: ${{ matrix.workspace }}/build
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ serde_json = "1.0"
# Use a patched version of cc-rs that respects the rustc wrapper
# This should greatly speed up CI builds!
[patch.crates-io]
cc = { git = "https://github.com/LeonMatthesKDAB/cc-rs.git", branch="respect-rustc-wrapper" }
cc = { git = "https://github.com/rust-lang/cc-rs.git", branch="main" }
1 change: 1 addition & 0 deletions crates/cxx-qt-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ impl CxxQtBuilder {
builder.flag_if_supported("/bigobj");
// GCC + Clang
builder.flag_if_supported("-std=c++17");
builder.flag_if_supported("-mmacosx-version-min=10.15");
// MinGW requires big-obj otherwise debug builds fail
builder.flag_if_supported("-Wa,-mbig-obj");
// Enable Qt Gui in C++ if the feature is enabled
Expand Down
1 change: 1 addition & 0 deletions crates/cxx-qt-lib/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ fn main() {
builder.flag_if_supported("/bigobj");
// GCC + Clang
builder.flag_if_supported("-std=c++17");
builder.flag_if_supported("-mmacosx-version-min=10.15");
// MinGW requires big-obj otherwise debug builds fail
builder.flag_if_supported("-Wa,-mbig-obj");

Expand Down

0 comments on commit 5f56f98

Please sign in to comment.