diff options
author | flu0r1ne <flu0r1ne@flu0r1ne.net> | 2021-08-30 23:40:05 -0500 |
---|---|---|
committer | flu0r1ne <flu0r1ne@flu0r1ne.net> | 2021-08-30 23:40:05 -0500 |
commit | b0f3a6481f6cdb80c457051ce3fe982cb2df5da5 (patch) | |
tree | ca1c97c07107de588c154a43b76bb82597d4f7ea | |
parent | f012f1c591e6b19ada9fe317af7959972f5da440 (diff) | |
parent | 582f4847fc388d8a64eb00143d4ffdd98a13aef0 (diff) | |
download | deb-planr-b0f3a6481f6cdb80c457051ce3fe982cb2df5da5.tar.xz deb-planr-b0f3a6481f6cdb80c457051ce3fe982cb2df5da5.zip |
Merge branch 'upstream' into ppa
Bump version to v0.0.3
-rw-r--r-- | adapters/gtest/config.go | 2 | ||||
-rw-r--r-- | adapters/gtest/templating.go | 8 | ||||
-rw-r--r-- | cmd/planr/main.go | 2 |
3 files changed, 6 insertions, 6 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}}" ) `) diff --git a/cmd/planr/main.go b/cmd/planr/main.go index 54c3d60..e2a85ed 100644 --- a/cmd/planr/main.go +++ b/cmd/planr/main.go @@ -10,7 +10,7 @@ import ( ) const ( - VERSION = "0.0.2" + VERSION = "0.0.3" ) func printUsage(w io.Writer) { |