From 172f4b21045a424f38145a89ba2bfcce304c3761 Mon Sep 17 00:00:00 2001 From: Flu0r1ne Date: Mon, 30 Aug 2021 23:17:59 -0500 Subject: Fix bug where paths with spaces would fail to build due to lack of CMake escape --- adapters/gtest/config.go | 2 +- adapters/gtest/templating.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adapters/gtest/config.go b/adapters/gtest/config.go index cb5ba75..cff45fa 100644 --- a/adapters/gtest/config.go +++ b/adapters/gtest/config.go @@ -64,7 +64,7 @@ func (cfg GtestConfig) srcList() string { if cfg.Srcs != nil { srcs := make([]string, len(*cfg.Srcs)) for i, src := range *cfg.Srcs { - srcs[i] = cfg.joinSrcs(src) + srcs[i] = "\"" + cfg.joinSrcs(src) + "\"" } srcList = strings.Join(srcs, "\n ") diff --git a/adapters/gtest/templating.go b/adapters/gtest/templating.go index a78eaf8..c49f170 100644 --- a/adapters/gtest/templating.go +++ b/adapters/gtest/templating.go @@ -42,18 +42,18 @@ func genCmake(out string, units []cmakeUnit) { func unitTemplate() *template.Template { tmpl, err := template.New("gtest_unit").Parse(` add_executable( - {{.Cname}} - {{.File}} + "{{.Cname}}" + "{{.File}}" {{.Srcs}} ) target_link_libraries( - {{.Cname}} + "{{.Cname}}" gtest_main ) gtest_discover_tests( - {{.Cname}} + "{{.Cname}}" ) `) -- cgit v1.2.3