File tree 6 files changed +55
-7
lines changed
6 files changed +55
-7
lines changed Original file line number Diff line number Diff line change @@ -42,6 +42,12 @@ corrosion_set_env_vars(${CRATE}
42
42
)
43
43
44
44
add_library (${APP_NAME} _lib INTERFACE )
45
+
46
+ # Rust always links against non-debug Windows runtime on *-msvc targets
47
+ # https://github.com/corrosion-rs/corrosion/blob/master/doc/src/common_issues.md#linking-debug-cc-libraries-into-rust-fails-on-windows-msvc-targets
48
+ # https://github.com/rust-lang/rust/issues/39016
49
+ set_target_properties (${APP_NAME} _lib PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" )
50
+
45
51
target_include_directories (${APP_NAME} _lib INTERFACE "${CXXQT_EXPORT_DIR} /${CRATE} " )
46
52
target_link_libraries (${APP_NAME} _lib INTERFACE
47
53
"$<LINK_LIBRARY:WHOLE_ARCHIVE,${CRATE} -static>"
Original file line number Diff line number Diff line change @@ -42,6 +42,12 @@ corrosion_set_env_vars(${CRATE}
42
42
"QMAKE=${QMAKE} "
43
43
)
44
44
add_library (${APP_NAME} _lib INTERFACE )
45
+
46
+ # Rust always links against non-debug Windows runtime on *-msvc targets
47
+ # https://github.com/corrosion-rs/corrosion/blob/master/doc/src/common_issues.md#linking-debug-cc-libraries-into-rust-fails-on-windows-msvc-targets
48
+ # https://github.com/rust-lang/rust/issues/39016
49
+ set_target_properties (${APP_NAME} _lib PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" )
50
+
45
51
target_include_directories (${APP_NAME} _lib INTERFACE "${CXXQT_EXPORT_DIR} /${CRATE} " )
46
52
target_link_libraries (${APP_NAME} _lib INTERFACE
47
53
"$<LINK_LIBRARY:WHOLE_ARCHIVE,${CRATE} -static>"
Original file line number Diff line number Diff line change @@ -64,6 +64,11 @@ corrosion_set_env_vars(${CRATE}
64
64
# the include paths and linked libraries for both of those.
65
65
add_library (${APP_NAME} _lib INTERFACE )
66
66
67
+ # Rust always links against non-debug Windows runtime on *-msvc targets
68
+ # https://github.com/corrosion-rs/corrosion/blob/master/doc/src/common_issues.md#linking-debug-cc-libraries-into-rust-fails-on-windows-msvc-targets
69
+ # https://github.com/rust-lang/rust/issues/39016
70
+ set_target_properties (${APP_NAME} _lib PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" )
71
+
67
72
# Include the headers generated by the Rust library's build script. Each
68
73
# crate gets its own subdirectory under CXXQT_EXPORT_DIR. This allows you
69
74
# to include headers generated by multiple crates without risk of one crate
Original file line number Diff line number Diff line change @@ -31,8 +31,16 @@ corrosion_set_env_vars(${CRATE}
31
31
"CXXQT_EXPORT_DIR=${CXXQT_EXPORT_DIR} "
32
32
"QMAKE=${QMAKE} "
33
33
)
34
- target_include_directories (${CRATE} INTERFACE "${CXXQT_EXPORT_DIR} /${CRATE} " )
35
- target_link_libraries (${CRATE} INTERFACE
34
+ add_library (basic-cxx-only_lib INTERFACE )
35
+
36
+ # Rust always links against non-debug Windows runtime on *-msvc targets
37
+ # https://github.com/corrosion-rs/corrosion/blob/master/doc/src/common_issues.md#linking-debug-cc-libraries-into-rust-fails-on-windows-msvc-targets
38
+ # https://github.com/rust-lang/rust/issues/39016
39
+ set_target_properties (basic-cxx-only_lib PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" )
40
+
41
+ target_include_directories (basic-cxx-only_lib INTERFACE "${CXXQT_EXPORT_DIR} /${CRATE} " )
42
+ target_link_libraries (basic-cxx-only_lib INTERFACE
43
+ "$<LINK_LIBRARY:WHOLE_ARCHIVE,${CRATE} -static>"
36
44
Qt::Core
37
45
Qt::Gui
38
46
Qt::Qml
@@ -44,6 +52,6 @@ add_executable(${APP_NAME}
44
52
)
45
53
target_include_directories (${APP_NAME} PRIVATE cpp)
46
54
target_link_libraries (${APP_NAME} PRIVATE
47
- ${CRATE}
55
+ basic-cxx-only_lib
48
56
Qt::Test
49
57
)
Original file line number Diff line number Diff line change @@ -30,15 +30,23 @@ corrosion_set_env_vars(${CRATE}
30
30
"CXXQT_EXPORT_DIR=${CXXQT_EXPORT_DIR} "
31
31
"QMAKE=${QMAKE} "
32
32
)
33
- target_include_directories (${CRATE} INTERFACE "${CXXQT_EXPORT_DIR} /${CRATE} " )
34
- target_link_libraries (${CRATE} INTERFACE
33
+ add_library (basic-cxx-qt_lib INTERFACE )
34
+
35
+ # Rust always links against non-debug Windows runtime on *-msvc targets
36
+ # https://github.com/corrosion-rs/corrosion/blob/master/doc/src/common_issues.md#linking-debug-cc-libraries-into-rust-fails-on-windows-msvc-targets
37
+ # https://github.com/rust-lang/rust/issues/39016
38
+ set_target_properties (basic-cxx-qt_lib PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" )
39
+
40
+ target_include_directories (basic-cxx-qt_lib INTERFACE "${CXXQT_EXPORT_DIR} /${CRATE} " )
41
+ target_link_libraries (basic-cxx-qt_lib INTERFACE
42
+ "$<LINK_LIBRARY:WHOLE_ARCHIVE,${CRATE} -static>"
35
43
Qt::Core
36
44
Qt::Gui
37
45
Qt::Qml
38
46
)
39
47
40
48
add_executable (${APP_NAME} cpp/main.cpp)
41
49
target_link_libraries (${APP_NAME} PRIVATE
42
- ${CRATE}
50
+ basic-cxx-qt_lib
43
51
Qt::Test
44
52
)
Original file line number Diff line number Diff line change @@ -31,6 +31,21 @@ corrosion_set_env_vars(${CRATE}
31
31
"CXXQT_EXPORT_DIR=${CXXQT_EXPORT_DIR} "
32
32
"QMAKE=${QMAKE} "
33
33
)
34
+ add_library (qt-types-standalone_lib INTERFACE )
35
+
36
+ # Rust always links against non-debug Windows runtime on *-msvc targets
37
+ # https://github.com/corrosion-rs/corrosion/blob/master/doc/src/common_issues.md#linking-debug-cc-libraries-into-rust-fails-on-windows-msvc-targets
38
+ # https://github.com/rust-lang/rust/issues/39016
39
+ set_target_properties (qt-types-standalone_lib PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" )
40
+
41
+ target_include_directories (qt-types-standalone_lib INTERFACE "${CXXQT_EXPORT_DIR} /${CRATE} " )
42
+ target_link_libraries (qt-types-standalone_lib INTERFACE
43
+ "$<LINK_LIBRARY:WHOLE_ARCHIVE,${CRATE} -static>"
44
+ Qt::Core
45
+ Qt::Gui
46
+ Qt::Qml
47
+ )
48
+
34
49
target_include_directories (${CRATE} INTERFACE "${CXXQT_EXPORT_DIR} /${CRATE} " )
35
50
target_link_libraries (${CRATE} INTERFACE
36
51
Qt::Core
@@ -77,6 +92,6 @@ add_executable(${APP_NAME}
77
92
target_include_directories (${APP_NAME} PRIVATE cpp)
78
93
79
94
target_link_libraries (${APP_NAME} PRIVATE
80
- ${CRATE}
95
+ qt-types-standalone_lib
81
96
Qt::Test
82
97
)
You can’t perform that action at this time.
0 commit comments