Skip to content

Commit 61185b8

Browse files
Fix CMake project name
This fixes project name to use both project name and target name to avoid confusion in case there are multiple projects with the same target name (e.g. CLion would list them with the same name on recent projects list).
1 parent 2f3f924 commit 61185b8

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

newt/builder/cmake.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,10 +412,10 @@ func CmakeCompilerWrite(w io.Writer, c *toolchain.Compiler) {
412412
fmt.Fprintln(w)
413413
}
414414

415-
func CmakeHeaderWrite(w io.Writer, c *toolchain.Compiler, targetName string) {
415+
func CmakeHeaderWrite(w io.Writer, c *toolchain.Compiler, projectName string) {
416416
fmt.Fprintln(w, "cmake_minimum_required(VERSION 3.7)\n")
417417
CmakeCompilerWrite(w, c)
418-
fmt.Fprintf(w, "project(%s VERSION 0.0.0 LANGUAGES C CXX ASM)\n\n", targetName)
418+
fmt.Fprintf(w, "project(%s VERSION 0.0.0 LANGUAGES C CXX ASM)\n\n", projectName)
419419
fmt.Fprintln(w, "SET(CMAKE_C_FLAGS_BACKUP \"${CMAKE_C_FLAGS}\")")
420420
fmt.Fprintln(w, "SET(CMAKE_CXX_FLAGS_BACKUP \"${CMAKE_CXX_FLAGS}\")")
421421
fmt.Fprintln(w, "SET(CMAKE_ASM_FLAGS_BACKUP \"${CMAKE_ASM_FLAGS}\")")
@@ -442,7 +442,11 @@ func CMakeTargetGenerate(target *target.Target) error {
442442
return err
443443
}
444444

445-
CmakeHeaderWrite(w, targetCompiler, target.ShortName())
445+
var proj *project.Project
446+
if proj, err = project.TryGetProject(); err != nil {
447+
return err
448+
}
449+
CmakeHeaderWrite(w, targetCompiler, fmt.Sprintf("\"%s (%s)\"", proj.Name(), target.ShortName()))
446450

447451
if err := targetBuilder.CMakeTargetBuilderWrite(w, targetCompiler); err != nil {
448452
return err

0 commit comments

Comments
 (0)