Merge pull request #194 from philipcraig/std_c++11_not_required_on_msvc

avoid MSVC warning via flag_if_supported
This commit is contained in:
David Tolnay 2020-05-09 12:06:54 -07:00 committed by GitHub
commit 6cadf70b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions

View File

@ -228,7 +228,7 @@ cxx-build = "0.3"
fn main() {
cxx_build::bridge("src/main.rs") // returns a cc::Build
.file("../demo-cxx/demo.cc")
.flag("-std=c++11")
.flag_if_supported("-std=c++11")
.compile("cxxbridge-demo");
println!("cargo:rerun-if-changed=src/main.rs");

View File

@ -3,7 +3,7 @@ fn main() {
.file("src/cxx.cc")
.cpp(true)
.cpp_link_stdlib(None) // linked via link-cplusplus crate
.flag("-std=c++11")
.flag_if_supported("-std=c++11")
.compile("cxxbridge03");
println!("cargo:rerun-if-changed=src/cxx.cc");
println!("cargo:rerun-if-changed=include/cxx.h");

View File

@ -1,7 +1,7 @@
fn main() {
cxx_build::bridge("src/main.rs")
.file("../demo-cxx/demo.cc")
.flag("-std=c++11")
.flag_if_supported("-std=c++11")
.compile("cxxbridge-demo");
println!("cargo:rerun-if-changed=src/main.rs");

View File

@ -16,7 +16,7 @@
//! fn main() {
//! cxx_build::bridge("src/main.rs")
//! .file("../demo-cxx/demo.cc")
//! .flag("-std=c++11")
//! .flag_if_supported("-std=c++11")
//! .compile("cxxbridge-demo");
//!
//! println!("cargo:rerun-if-changed=src/main.rs");
@ -83,7 +83,7 @@ pub fn bridge(rust_source_file: impl AsRef<Path>) -> cc::Build {
/// let source_files = vec!["src/main.rs", "src/path/to/other.rs"];
/// cxx_build::bridges(source_files)
/// .file("../demo-cxx/demo.cc")
/// .flag("-std=c++11")
/// .flag_if_supported("-std=c++11")
/// .compile("cxxbridge-demo");
/// ```
pub fn bridges(rust_source_files: impl IntoIterator<Item = impl AsRef<Path>>) -> cc::Build {

View File

@ -233,7 +233,7 @@
//! fn main() {
//! cxx_build::bridge("src/main.rs") // returns a cc::Build
//! .file("../demo-cxx/demo.cc")
//! .flag("-std=c++11")
//! .flag_if_supported("-std=c++11")
//! .compile("cxxbridge-demo");
//!
//! println!("cargo:rerun-if-changed=src/main.rs");

View File

@ -6,6 +6,6 @@ fn main() {
let sources = vec!["lib.rs", "module.rs"];
cxx_build::bridges(sources)
.file("tests.cc")
.flag("-std=c++11")
.flag_if_supported("-std=c++11")
.compile("cxx-test-suite");
}