diff options
author | Ondřej Čertík <ondrej@certik.us> | 2020-02-20 16:26:02 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-20 16:26:02 -0600 |
commit | 2292bbd1d57c97d800e87e1cb6ccd1981ad50333 (patch) | |
tree | 9000e8f9f875a6b1ada1c4b692875d321b5cb20d /src | |
parent | 21020c2f60a2a0f07bc4ef2506004ed5a361793b (diff) | |
parent | 1dd8df9120fd6d7b4381b8dbc63acc4325450ad7 (diff) | |
download | fpm-2292bbd1d57c97d800e87e1cb6ccd1981ad50333.tar.gz fpm-2292bbd1d57c97d800e87e1cb6ccd1981ad50333.zip |
Merge pull request #37 from certik/ci
CI: Do not install GFortran (already present)
Diffstat (limited to 'src')
-rw-r--r-- | src/main.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main.rs b/src/main.rs index be71598..340c1d3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,7 @@ use structopt::StructOpt; use toml::Value; use std::path::{Path, PathBuf}; +use std::env; #[derive(Debug, StructOpt)] struct Cli { @@ -67,10 +68,14 @@ add_executable(p1 ../main.f90 {}) }; args.extend(vec!["-B", "build", "."]); println!("[+] cmake {:?}", args); + let fc : String = match env::var("FC") { + Ok(val) => val, + Err(_) => "gfortran".to_string(), + }; let output = std::process::Command::new("cmake") .args(&args) .current_dir(target_dir) - .env("FC", "gfortran") + .env("FC", fc) .output().unwrap(); println!("status: {}", output.status); println!("stdout: {}", String::from_utf8_lossy(&output.stdout)); |