Skip to content

Meta project fixes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahayzen-kdab merged 5 commits into from
Jan 15, 2024
Merged

Meta project fixes #5

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24438fd
meta_project: use `extern crate` rather than `pub use`
Be-ing Dec 1, 2023
9cfc997
CMake: exclude qml-meta-project from `cargo test`
Be-ing Dec 1, 2023
61120c2
GH Actions: try not building in parallel
Be-ing Dec 1, 2023
8388ad0
meta_project: do not parallelize build
Be-ing Dec 1, 2023
4a33449
GH Actions: explicitly use --parallel 1 for CMake build
Be-ing Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,13 @@ endif()
set(CARGO_TARGET_DIR "${CMAKE_BINARY_DIR}/${BUILD_DIR}/cargo/build")

# Add CMake tests for `cargo test/clippy/fmt/doc`.
add_test(NAME cargo_tests COMMAND cargo test --features link_qt_object_files --all-targets --target-dir
${CARGO_TARGET_DIR})
add_test(NAME cargo_doc_tests COMMAND cargo test --features link_qt_object_files --doc --target-dir
Copy link
Owner

@ahayzen-kdab ahayzen-kdab Dec 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can --all-targets and --exclude not be combined? So that it does "all except qml-meta-project"

Copy link
Owner

@ahayzen-kdab ahayzen-kdab Dec 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also this failed to build on Windows Qt 5 🤔

Copy link
Author

@Be-ing Be-ing Dec 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--exclude only works with --workspace, not --all-targets

${CARGO_TARGET_DIR})

# qml-meta-project has issues linking with Qt 5 on Windows, as well as with GNU ld.gold.
# There are no Cargo tests for that example anyway, so skip building it with `cargo test`.
add_test(NAME cargo_tests COMMAND cargo test --features link_qt_object_files --workspace --exclude qml-meta-project
--target-dir ${CARGO_TARGET_DIR})
add_test(NAME cargo_doc_tests COMMAND cargo test --features link_qt_object_files --doc
--target-dir ${CARGO_TARGET_DIR})
add_test(NAME cargo_doc COMMAND cargo doc --workspace --target-dir ${CARGO_TARGET_DIR})
add_test(NAME cargo_clippy COMMAND cargo clippy --all-targets --target-dir
${CARGO_TARGET_DIR} -- -D warnings)
Expand Down
6 changes: 3 additions & 3 deletions examples/meta_project/rust/main/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ mod main_object;

// Ensure the symbols from the rlib dependencies end up
// in the staticlib (if you use Rust symbols from these
// crates in this crate, you can skip these `pub use` statements).
pub use sub1;
pub use sub2;
// crates in this crate, you can skip these `extern crate` statements).
extern crate sub1;
extern crate sub2;