KDAB · ahayzen-kdab · Feb 18, 2025 · Feb 17, 2025 · Feb 17, 2025 · Feb 17, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,10 +149,10 @@ set(CARGO_TARGET_DIR "${CMAKE_BINARY_DIR}/${BUILD_DIR}/cargo/build")
 
 if(BUILD_TESTING)
     # Add CMake tests for `cargo test/clippy/fmt/doc`.
-    add_test(NAME cargo_tests COMMAND cargo test --release --all-features --target-dir ${CARGO_TARGET_DIR})
-    add_test(NAME cargo_doc COMMAND cargo doc --release --all-features --target-dir ${CARGO_TARGET_DIR})
+    add_test(NAME cargo_tests COMMAND cargo test --locked --release --all-features --target-dir ${CARGO_TARGET_DIR})
+    add_test(NAME cargo_doc COMMAND cargo doc --locked --release --all-features --target-dir ${CARGO_TARGET_DIR})
     # Minimum clippy version for the incompatible_msrv lint is 1.78.0
-    add_test(NAME cargo_clippy COMMAND cargo +1.78.0 clippy --release --all-features --target-dir ${CARGO_TARGET_DIR} -- -D warnings)
+    add_test(NAME cargo_clippy COMMAND cargo +1.78.0 clippy --locked --release --all-features --target-dir ${CARGO_TARGET_DIR} -- -D warnings)
 
     set_tests_properties(cargo_tests cargo_clippy PROPERTIES
         ENVIRONMENT_MODIFICATION "${CARGO_ENV}"
@@ -168,7 +168,7 @@ if(BUILD_TESTING)
     add_test(NAME cxx_qt_gen_test_outputs_gen COMMAND rustfmt --check ${CXX_QT_GEN_TEST_OUTPUTS})
 
     # Add test which checks that a build rerun doesn't recompile and uses caches instead
-    add_test(NAME cargo_build_rerun COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/scripts/check_cargo_build_rerun.sh" "${CMAKE_CURRENT_SOURCE_DIR}")
+    add_test(NAME cargo_build_rerun COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/scripts/check_cargo_build_rerun.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${CARGO_TARGET_DIR}")
 
     # Ensure that cargo_build_rerun doesn't run while we are already building
     set_tests_properties(cargo_build_rerun PROPERTIES RUN_SERIAL TRUE)

diff --git a/examples/demo_threading/CMakeLists.txt b/examples/demo_threading/CMakeLists.txt
@@ -56,7 +56,9 @@ set(CRATE cxx_qt_demo_threading)
 cxx_qt_import_crate(
     MANIFEST_PATH rust/Cargo.toml
     CRATES ${CRATE}
-    QT_MODULES Qt::Core)
+    LOCKED
+    QT_MODULES Qt::Core
+)
 cxx_qt_import_qml_module(${CRATE}_qml
     URI "com.kdab.energy"
     SOURCE_CRATE ${CRATE})

diff --git a/examples/qml_features/CMakeLists.txt b/examples/qml_features/CMakeLists.txt
@@ -56,6 +56,7 @@ set(CRATE qml_features)
 cxx_qt_import_crate(
     MANIFEST_PATH rust/Cargo.toml
     CRATES ${CRATE}
+    LOCKED
     QT_MODULES Qt::Core Qt::Gui Qt::Qml Qt::Quick
 )
 cxx_qt_import_qml_module(${CRATE}_qml

diff --git a/examples/qml_minimal/CMakeLists.txt b/examples/qml_minimal/CMakeLists.txt
@@ -68,7 +68,9 @@ endif()
 cxx_qt_import_crate(
     MANIFEST_PATH rust/Cargo.toml 
     CRATES qml_minimal 
-    QT_MODULES Qt::Core Qt::Gui Qt::Qml Qt::QuickControls2)
+    LOCKED
+    QT_MODULES Qt::Core Qt::Gui Qt::Qml Qt::QuickControls2
+)
 
 cxx_qt_import_qml_module(qml_minimal_qml_module
     URI "com.kdab.cxx_qt.demo"

diff --git a/examples/qml_multi_crates/CMakeLists.txt b/examples/qml_multi_crates/CMakeLists.txt
@@ -54,7 +54,9 @@ endif()
 cxx_qt_import_crate(MANIFEST_PATH rust/main/Cargo.toml
     CRATES qml_multi_crates
     CRATE_TYPES staticlib
-    QT_MODULES Qt::Core Qt::Gui Qt::Qml Qt::QuickControls2 Qt::Network)
+    LOCKED
+    QT_MODULES Qt::Core Qt::Gui Qt::Qml Qt::QuickControls2 Qt::Network
+)
 
 cxx_qt_import_qml_module(qml_multi_crates_main
     URI "com.kdab.cxx_qt.demo"

diff --git a/scripts/check_cargo_build_rerun.sh b/scripts/check_cargo_build_rerun.sh
@@ -7,15 +7,16 @@
 
 set -ex
 
+SOURCE_FOLDER=$1
+BUILD_FOLDER=$2
+
 # Ensure we are in the right directory
-SCRIPT=$(realpath "$0")
-SCRIPTPATH=$(dirname "$SCRIPT")
-cd "$SCRIPTPATH/../"
+cd "$SOURCE_FOLDER"
 
 # Ensure that we do see a "Compiling" in the output
 # as if we do it means we have a cargo::rerun-if-changed incorrectly
 function check_build_contains_compiling() {
-    BUILD=$(cargo build -p qml-minimal-no-cmake 2>&1)
+    BUILD=$(cargo build --locked --release --target-dir="$BUILD_FOLDER" -p qml-minimal-no-cmake 2>&1)
 
     if ! echo "$BUILD" | grep -q Compiling; then
         echo "cargo build is missing text 'Compiling', likely an incorrect cargo::rerun-if-changed in a build script."
@@ -26,7 +27,7 @@ function check_build_contains_compiling() {
 # Ensure that we don't see any "Compiling" in the output
 # as if we do it means we have a cargo::rerun-if-changed incorrectly
 function check_build_no_compiling() {
-    BUILD=$(cargo build -p qml-minimal-no-cmake 2>&1)
+    BUILD=$(cargo build --locked --release --target-dir="$BUILD_FOLDER" -p qml-minimal-no-cmake 2>&1)
 
     if echo "$BUILD" | grep -q Compiling; then
         echo "cargo build contained text 'Compiling', likely an incorrect cargo::rerun-if-changed in a build script."
@@ -35,20 +36,20 @@ function check_build_no_compiling() {
 }
 
 # Build once
-cargo build -p qml-minimal-no-cmake
+cargo build --locked --release --target-dir="$BUILD_FOLDER" -p qml-minimal-no-cmake
 
 # Build a second time
 check_build_no_compiling
 
 # Modify a qml file
-touch "$SCRIPTPATH/../examples/cargo_without_cmake/qml/main.qml"
+touch "$SOURCE_FOLDER/examples/cargo_without_cmake/qml/main.qml"
 
 # Build a third and fourth time
 check_build_contains_compiling
 check_build_no_compiling
 
 # Modify a Rust file
-touch "$SCRIPTPATH/../examples/cargo_without_cmake/src/cxxqt_object.rs"
+touch "$SOURCE_FOLDER/examples/cargo_without_cmake/src/cxxqt_object.rs"
 
 # Build a fifth and sixth time
 check_build_contains_compiling

diff --git a/tests/basic_cxx_only/CMakeLists.txt b/tests/basic_cxx_only/CMakeLists.txt
@@ -43,7 +43,7 @@ if(NOT CxxQt_FOUND)
 endif()
 
 set(CRATE basic_cxx_only)
-cxx_qt_import_crate(MANIFEST_PATH rust/Cargo.toml CRATES ${CRATE} QT_MODULES Qt::Core)
+cxx_qt_import_crate(MANIFEST_PATH rust/Cargo.toml CRATES ${CRATE} LOCKED QT_MODULES Qt::Core)
 
 if(BUILD_WASN)
     # Add -DRUST_CXX_NO_EXCEPTIONS to CXXFLAGS, as WASM does not support exceptions

diff --git a/tests/basic_cxx_qt/CMakeLists.txt b/tests/basic_cxx_qt/CMakeLists.txt
@@ -43,7 +43,7 @@ if(NOT CxxQt_FOUND)
 endif()
 
 set(CRATE basic_cxx_qt)
-cxx_qt_import_crate(MANIFEST_PATH rust/Cargo.toml CRATES ${CRATE} QT_MODULES Qt::Core)
+cxx_qt_import_crate(MANIFEST_PATH rust/Cargo.toml CRATES ${CRATE} LOCKED QT_MODULES Qt::Core)
 
 if(BUILD_WASN)
     # Add -DRUST_CXX_NO_EXCEPTIONS to CXXFLAGS, as WASM does not support exceptions

diff --git a/tests/qt_types_standalone/CMakeLists.txt b/tests/qt_types_standalone/CMakeLists.txt
@@ -46,6 +46,7 @@ set(CRATE qt_types_standalone)
 cxx_qt_import_crate(
     MANIFEST_PATH rust/Cargo.toml
     CRATES ${CRATE}
+    LOCKED
     QT_MODULES Qt::Core Qt::Gui Qt::Qml
 )