fix: add various dependencies

This commit is contained in:
Gabriele Musco 2023-10-14 14:47:06 +02:00
commit 1b1effe7a4
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
6 changed files with 52 additions and 7 deletions

View file

@ -1,12 +1,13 @@
use crate::{ use crate::{
depcheck::{check_dependencies, DepType, Dependency, DependencyCheckResult}, depcheck::{check_dependencies, DepType, Dependency, DependencyCheckResult},
dependencies::common::dep_eigen, dependencies::common::{dep_eigen, dep_gpp},
linux_distro::LinuxDistro, linux_distro::LinuxDistro,
}; };
use std::collections::HashMap; use std::collections::HashMap;
fn basalt_deps() -> Vec<Dependency> { fn basalt_deps() -> Vec<Dependency> {
vec![ vec![
dep_gpp(),
Dependency { Dependency {
name: "boost".into(), name: "boost".into(),
dep_type: DepType::SharedObject, dep_type: DepType::SharedObject,

View file

@ -65,3 +65,29 @@ pub fn dep_glslang_validator() -> Dependency {
]), ]),
} }
} }
pub fn dep_gcc() -> Dependency {
Dependency {
name: "gcc".into(),
dep_type: DepType::Executable,
filename: "gcc".into(),
packages: HashMap::from([
(LinuxDistro::Arch, "gcc".into()),
(LinuxDistro::Debian, "gcc".into()),
(LinuxDistro::Fedora, "gcc".into()),
]),
}
}
pub fn dep_gpp() -> Dependency {
Dependency {
name: "g++".into(),
dep_type: DepType::Executable,
filename: "g++".into(),
packages: HashMap::from([
(LinuxDistro::Arch, "gcc".into()),
(LinuxDistro::Debian, "g++".into()),
(LinuxDistro::Fedora, "g++".into()),
]),
}
}

View file

@ -1,10 +1,17 @@
use crate::{ use crate::{
depcheck::{check_dependencies, Dependency, DependencyCheckResult}, depcheck::{check_dependencies, Dependency, DependencyCheckResult},
dependencies::common::{dep_cmake, dep_eigen, dep_git, dep_ninja}, dependencies::common::{dep_cmake, dep_eigen, dep_gcc, dep_git, dep_gpp, dep_ninja},
}; };
fn libsurvive_deps() -> Vec<Dependency> { fn libsurvive_deps() -> Vec<Dependency> {
vec![dep_eigen(), dep_cmake(), dep_git(), dep_ninja()] vec![
dep_eigen(),
dep_cmake(),
dep_git(),
dep_ninja(),
dep_gcc(),
dep_gpp(),
]
} }
pub fn check_libsurvive_deps() -> Vec<DependencyCheckResult> { pub fn check_libsurvive_deps() -> Vec<DependencyCheckResult> {

View file

@ -1,6 +1,8 @@
use crate::{ use crate::{
depcheck::{check_dependencies, DepType, Dependency, DependencyCheckResult}, depcheck::{check_dependencies, DepType, Dependency, DependencyCheckResult},
dependencies::common::{dep_cmake, dep_eigen, dep_git, dep_glslang_validator, dep_ninja}, dependencies::common::{
dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_ninja,
},
linux_distro::LinuxDistro, linux_distro::LinuxDistro,
}; };
use std::collections::HashMap; use std::collections::HashMap;
@ -60,6 +62,8 @@ fn monado_deps() -> Vec<Dependency> {
dep_eigen(), dep_eigen(),
dep_git(), dep_git(),
dep_ninja(), dep_ninja(),
dep_gcc(),
dep_gpp(),
Dependency { Dependency {
name: "glslc".into(), name: "glslc".into(),
dep_type: DepType::Executable, dep_type: DepType::Executable,

View file

@ -1,7 +1,10 @@
use crate::depcheck::{check_dependencies, Dependency, DependencyCheckResult}; use crate::{
depcheck::{check_dependencies, Dependency, DependencyCheckResult},
dependencies::common::{dep_cmake, dep_gcc, dep_git, dep_gpp, dep_ninja},
};
fn openhmd_deps() -> Vec<Dependency> { fn openhmd_deps() -> Vec<Dependency> {
vec![] vec![dep_gcc(), dep_gpp(), dep_cmake(), dep_ninja(), dep_git()]
} }
pub fn check_openhmd_deps() -> Vec<DependencyCheckResult> { pub fn check_openhmd_deps() -> Vec<DependencyCheckResult> {

View file

@ -1,6 +1,8 @@
use crate::{ use crate::{
depcheck::{check_dependencies, DepType, Dependency, DependencyCheckResult}, depcheck::{check_dependencies, DepType, Dependency, DependencyCheckResult},
dependencies::common::{dep_cmake, dep_eigen, dep_git, dep_glslang_validator, dep_ninja}, dependencies::common::{
dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_ninja,
},
linux_distro::LinuxDistro, linux_distro::LinuxDistro,
}; };
use std::collections::HashMap; use std::collections::HashMap;
@ -11,6 +13,8 @@ fn wivrn_deps() -> Vec<Dependency> {
dep_cmake(), dep_cmake(),
dep_ninja(), dep_ninja(),
dep_git(), dep_git(),
dep_gcc(),
dep_gpp(),
Dependency { Dependency {
name: "x264-dev".into(), name: "x264-dev".into(),
dep_type: DepType::Include, dep_type: DepType::Include,