Move C++ tree into firmware/
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1 +1 @@
|
|||||||
build
|
firmware/build
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ func main() {
|
|||||||
fmt.Fprintf(os.Stderr, "error: %v\n", err)
|
fmt.Fprintf(os.Stderr, "error: %v\n", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
buildDir := filepath.Join(wd, "build")
|
buildDir := filepath.Join(wd, "firmware", "build")
|
||||||
|
|
||||||
if err := run(buildDir); err != nil {
|
if err := run(buildDir); err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "error: %v\n", err)
|
fmt.Fprintf(os.Stderr, "error: %v\n", err)
|
||||||
@@ -27,7 +27,7 @@ func main() {
|
|||||||
|
|
||||||
func run(buildDir string) error {
|
func run(buildDir string) error {
|
||||||
fmt.Println("Configuring...")
|
fmt.Println("Configuring...")
|
||||||
cmake := exec.Command("cmake", "-B", buildDir)
|
cmake := exec.Command("cmake", "-S", filepath.Join(filepath.Dir(buildDir)), "-B", buildDir)
|
||||||
cmake.Stdout = os.Stdout
|
cmake.Stdout = os.Stdout
|
||||||
cmake.Stderr = os.Stderr
|
cmake.Stderr = os.Stderr
|
||||||
if err := cmake.Run(); err != nil {
|
if err := cmake.Run(); err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user