Merge pull request #35 from ids1024/redox

alexcrichton · web-flow · commit cea0df225e0e · 2017-07-24T09:02:48.000-05:00
Define CMAKE_SYSTEM_NAME when compiling for Redox
diff --git a/src/lib.rs b/src/lib.rs
@@ -314,6 +314,10 @@ impl Config {
             if self.generator.is_none() {
                 cmd.arg("-G").arg(self.visual_studio_generator(&target));
             }
+        } else if target.contains("redox") {
+            if !self.defined("CMAKE_SYSTEM_NAME") {
+                cmd.arg("-DCMAKE_SYSTEM_NAME=Generic");
+            }
         }
         let mut is_ninja = false;
         if let Some(ref generator) = self.generator {

Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,10 @@ impl Config {`
`314`	`314`	`if self.generator.is_none() {`
`315`	`315`	`cmd.arg("-G").arg(self.visual_studio_generator(&target));`
`316`	`316`	`}`
	`317`	`+ } else if target.contains("redox") {`
	`318`	`+ if !self.defined("CMAKE_SYSTEM_NAME") {`
	`319`	`+ cmd.arg("-DCMAKE_SYSTEM_NAME=Generic");`
	`320`	`+ }`
`317`	`321`	`}`
`318`	`322`	`let mut is_ninja = false;`
`319`	`323`	`if let Some(ref generator) = self.generator {`