diff options
author | Fred Baksik <frodak17@gmail.com> | 2019-01-05 20:10:24 (GMT) |
---|---|---|
committer | Fred Baksik <frodak17@gmail.com> | 2019-01-16 15:41:53 (GMT) |
commit | 1a66acdef268865e5816bd56176274034769b1b5 (patch) | |
tree | 906c3e68d313f39997ef713826c4eae8c7a83d27 /Source/cmGlobalGhsMultiGenerator.cxx | |
parent | 0c9e47d7cdb498f9bc29231587030e0840c9f00c (diff) | |
download | CMake-1a66acdef268865e5816bd56176274034769b1b5.zip CMake-1a66acdef268865e5816bd56176274034769b1b5.tar.gz CMake-1a66acdef268865e5816bd56176274034769b1b5.tar.bz2 |
GHS: Append ".gpj" to target name when generating build command
-- Add test demonstrating issue
-- In the case of executable targets the target name is usually the same as used in "-o filename"
But for static libraries the target name is usually "-o libname.a"
"gbuild.exe target" will build whatever target matches against even the output from the compiler or linker
But the targets in "cmake --build . --target name" should be target names in CMakeLists.txt not the actual filenames
So change the "name" to "name.gpj" so it matches the target name in CMakeLists.txt.
Fixes #15975
Diffstat (limited to 'Source/cmGlobalGhsMultiGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGhsMultiGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index e850e05..664d967 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -413,7 +413,11 @@ void cmGlobalGhsMultiGenerator::GenerateBuildCommand( if (targetName == "clean") { makeCommand.push_back("-clean"); } else { - makeCommand.push_back(targetName); + if (targetName.compare(targetName.size() - 4, 4, ".gpj") == 0) { + makeCommand.push_back(targetName); + } else { + makeCommand.push_back(targetName + ".gpj"); + } } } } |