echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regression in target output file naming logic

Browse Source 
Refactoring in commit f4ff60a803 (cmMakefile: Make GetSafeDefinition
return std::string const&, 2018-09-05) accidentally changed the logic
for target artifact prefix and suffix names such that setting a PREFIX
or SUFFIX target property would cause an empty value to be used.  Revert
that part of the change and use a simpler alternative.  Add a test case.

Reported-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
This commit is contained in:
Brad King 2018-09-19 07:43:34 -04:00
parent d686f81e58
commit 2428422c02
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmGeneratorTarget.cxx
View File

@ -3488,13 +3488,12 @@ void cmGeneratorTarget::GetFullNameInternal(
}
// if there is no prefix on the target use the cmake definition
std::string targetPrefix2, targetSuffix2;
if (!targetPrefix && prefixVar) {
targetPrefix2 = this->Makefile->GetSafeDefinition(prefixVar);
targetPrefix = this->Makefile->GetSafeDefinition(prefixVar).c_str();
}
// if there is no suffix on the target use the cmake definition
if (!targetSuffix && suffixVar) {
targetSuffix2 = this->Makefile->GetSafeDefinition(suffixVar);
targetSuffix = this->Makefile->GetSafeDefinition(suffixVar).c_str();
}
// frameworks have directory prefix but no suffix
@ -3502,19 +3501,19 @@ void cmGeneratorTarget::GetFullNameInternal(
if (this->IsFrameworkOnApple()) {
fw_prefix = this->GetFrameworkDirectory(config, ContentLevel);
fw_prefix += "/";
targetPrefix2 = fw_prefix;
targetSuffix2.clear();
targetPrefix = fw_prefix.c_str();
targetSuffix = nullptr;
}
if (this->IsCFBundleOnApple()) {
fw_prefix = this->GetCFBundleDirectory(config, FullLevel);
fw_prefix += "/";
targetPrefix2 = fw_prefix;
targetSuffix2.clear();
targetPrefix = fw_prefix.c_str();
targetSuffix = nullptr;
}
// Begin the final name with the prefix.
outPrefix = targetPrefix2;
outPrefix = targetPrefix ? targetPrefix : "";
// Append the target name or property-specified name.
outBase += this->GetOutputName(config, artifact);
@ -3533,7 +3532,7 @@ void cmGeneratorTarget::GetFullNameInternal(
}
// Append the suffix.
outSuffix = targetSuffix2;
outSuffix = targetSuffix ? targetSuffix : "";
}
std::string cmGeneratorTarget::GetLinkerLanguage(

1
Tests/CMakeLists.txt
View File

@ -368,6 +368,7 @@ if(BUILD_TESTING)
ADD_TEST_MACRO(CxxSubdirC CxxSubdirC)
ADD_TEST_MACRO(IPO COnly/COnly)
ADD_TEST_MACRO(OutDir runtime/OutDir)
ADD_TEST_MACRO(OutName exe.OutName.exe)
ADD_TEST_MACRO(ObjectLibrary UseCshared)
ADD_TEST_MACRO(NewlineArgs NewlineArgs)
ADD_TEST_MACRO(SetLang SetLang)

6
Tests/OutName/CMakeLists.txt Normal file
View File

@ -0,0 +1,6 @@
cmake_minimum_required(VERSION 3.12)
project(OutName C)
add_executable(OutName main.c)
set_property(TARGET OutName PROPERTY PREFIX exe.)
set_property(TARGET OutName PROPERTY SUFFIX .exe)

4
Tests/OutName/main.c Normal file
View File

@ -0,0 +1,4 @@
int main(void)
{
return 0;
}