use new corrosion_add_target_generated_headers function

Author: Be-ing

Cargo.toml

@@ -22,3 +22,7 @@ members = [
     "tests/basic_cxx_qt/rust",
     "tests/qt_types_standalone/rust",
 ]
+
+[patch.crates-io]
+cxx = { git = "https://github.com/Be-ing/cxx.git", branch = "cxxbuild_output_var" }
+cxx-build = { git = "https://github.com/Be-ing/cxx.git", branch = "cxxbuild_output_var" }

book/src/concepts/build_systems.md

@@ -12,5 +12,5 @@ CXX-Qt can be integrated into existing CMake projects or built with only cargo.
   * [CMake Integration](../getting-started/5-cmake-integration.md)
   * [Cargo Integration](../getting-started/6-cargo-executable.md)
 
-CXX-Qt could work with any C++ build system so long as the `QMAKE` and `CXXQT_EXPORT_DIR` environment variables are set before calling Cargo,
+CXX-Qt could work with any C++ build system so long as the `QMAKE` and `GENERATED_HEADER_DIR` environment variables are set before calling Cargo,
 as documented in [CMake integration](../getting-started/5-cmake-integration.md). However, using C++ build systems besides CMake with CXX-Qt is untested.

crates/cxx-qt-build/src/lib.rs

@@ -221,7 +221,7 @@ fn generate_cxxqt_cpp_files(
 /// running `cargo build`. Otherwise [CxxQtBuilder] prefers the newer version by default.
 ///
 /// To use [CxxQtBuilder] for a library to link with a C++ application, specify a directory to output
-/// cxx-qt's autogenerated headers by having the C++ build system set the `CXXQT_EXPORT_DIR`
+/// cxx-qt's autogenerated headers by having the C++ build system set the `GENERATED_HEADER_DIR`
 /// environment variable before calling `cargo build`. Then, add the same directory path to the C++
 /// include paths. Also, set the `QMAKE` environment variable to the path of the `qmake` executable
 /// for the Qt installation found by the C++ build system. This ensures that the C++ build system and
@@ -350,12 +350,11 @@ impl CxxQtBuilder {
 
         // The include directory needs to be namespaced by crate name when exporting for a C++ build system,
         // but for using cargo build without a C++ build system, OUT_DIR is already namespaced by crate name.
-        let header_root = match env::var("CXXQT_EXPORT_DIR") {
-            Ok(export_dir) => format!("{}/{}", export_dir, env::var("CARGO_PKG_NAME").unwrap()),
-            Err(_) => env::var("OUT_DIR").unwrap(),
-        };
+        let header_root =
+            env::var("GENERATED_HEADER_DIR").unwrap_or_else(|_| env::var("OUT_DIR").unwrap());
+        let generated_header_dir =
+            format!("{}/{}", header_root, env::var("CARGO_PKG_NAME").unwrap());
         self.cc_builder.include(&header_root);
-        let generated_header_dir = format!("{}/cxx-qt-gen", header_root);
 
         cxx_qt_lib_headers::write_headers(&format!("{}/cxx-qt-lib", header_root));
 

crates/cxx-qt-gen/src/generator/rust/mod.rs

@@ -48,7 +48,8 @@ impl GeneratedRustBlocks {
 
 /// Generate the include line for this parsed block
 fn generate_include(parser: &Parser) -> Result<Item> {
-    let import_path = format!("cxx-qt-gen/{}.cxxqt.h", parser.cxx_file_stem);
+    let crate_name = std::env::var("CARGO_PKG_NAME").unwrap();
+    let import_path = format!("{}/{}.cxxqt.h", crate_name, parser.cxx_file_stem);
 
     syn::parse2(quote! {
         unsafe extern "C++" {

crates/cxx-qt-gen/src/writer/cpp/header.rs

@@ -129,12 +129,13 @@ pub fn write_cpp_header(generated: &GeneratedCppBlocks) -> String {
         }}
 
         {forward_declare}
-        #include "cxx-qt-gen/{cxx_file_stem}.cxx.h"
+        #include "{crate_name}/{cxx_file_stem}.cxx.h"
 
         {qobjects}
     "#,
     cxx_file_stem = generated.cxx_file_stem,
     forward_declare = forward_declare(generated).join("\n"),
+    crate_name = std::env::var("CARGO_PKG_NAME").unwrap(),
     qobjects = qobjects_header(generated).join("\n"),
     }
 }

crates/cxx-qt-gen/src/writer/cpp/source.rs

@@ -80,10 +80,11 @@ fn qobjects_source(generated: &GeneratedCppBlocks) -> Vec<String> {
 /// For a given GeneratedCppBlocks write this into a C++ source
 pub fn write_cpp_source(generated: &GeneratedCppBlocks) -> String {
     formatdoc! {r#"
-        #include "cxx-qt-gen/{cxx_file_stem}.cxxqt.h"
+        #include "{crate_name}/{cxx_file_stem}.cxxqt.h"
 
         {qobjects}
     "#,
+    crate_name = std::env::var("CARGO_PKG_NAME").unwrap(),
     cxx_file_stem = generated.cxx_file_stem,
     qobjects = qobjects_source(generated).join("\n"),
     }

examples/cargo_without_cmake/CMakeLists.txt

@@ -26,8 +26,8 @@ if(NOT Corrosion_FOUND)
     include(FetchContent)
     FetchContent_Declare(
         Corrosion
-        GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
-        GIT_TAG v0.2.1
+        GIT_REPOSITORY https://github.com/Be-ing/corrosion.git
+        GIT_TAG code_generators
     )
 
     FetchContent_MakeAvailable(Corrosion)

examples/cargo_without_cmake/src/cpp/run.cpp

@@ -11,7 +11,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
 
-#include "cxx-qt-gen/my_object.cxxqt.h"
+#include "qml-minimal-no-cmake/my_object.cxxqt.h"
 
 // Include the C++ code generated by rcc from the .qrc file
 #include "qml.qrc.cpp"

examples/demo_threading/CMakeLists.txt

@@ -27,21 +27,17 @@ if(NOT Corrosion_FOUND)
     include(FetchContent)
     FetchContent_Declare(
         Corrosion
-        GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
-        GIT_TAG v0.2.1
+        GIT_REPOSITORY https://github.com/Be-ing/corrosion.git
+        GIT_TAG code_generators
     )
 
     FetchContent_MakeAvailable(Corrosion)
 endif()
 
 set(CRATE demo-threading)
 corrosion_import_crate(MANIFEST_PATH rust/Cargo.toml CRATES ${CRATE})
-set(CXXQT_EXPORT_DIR "${CMAKE_CURRENT_BINARY_DIR}/cxxqt")
-corrosion_set_env_vars(${CRATE}
-    "CXXQT_EXPORT_DIR=${CXXQT_EXPORT_DIR}"
-    "QMAKE=${QMAKE}"
-)
-target_include_directories(${CRATE} INTERFACE "${CXXQT_EXPORT_DIR}/${CRATE}")
+corrosion_add_target_generated_headers(${CRATE})
+corrosion_set_env_vars(${CRATE} "QMAKE=${QMAKE}")
 target_link_libraries(${CRATE} INTERFACE
     Qt::Core
     Qt::Gui

examples/demo_threading/cpp/helpers/energyusageproxymodel.h

@@ -12,7 +12,7 @@
 #include <QAbstractListModel>
 #include <QVector>
 
-#include "cxx-qt-gen/energy_usage.cxxqt.h"
+#include "demo-threading/energy_usage.cxxqt.h"
 
 class EnergyUsageProxyModel : public QAbstractListModel
 {