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

CodeLite: Prefer CMAKE_RUNTIME_OUTPUT_DIRECTORY for output path

Browse Source 
Use the deprecated `EXECUTABLE_OUTPUT_PATH` as a fallback.
This commit is contained in:
Tobias R. Henle 2018-03-11 15:18:17 +01:00 committed by Brad King
parent acd322ebe4
commit 334c8ba7a4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmExtraCodeLiteGenerator.cxx
View File

@ -408,7 +408,6 @@ void cmExtraCodeLiteGenerator::CreateProjectSourceEntries(
const std::string& projectPath, const cmMakefile* mf,
const std::string& projectType, const std::string& targetName)
{
cmXMLWriter& xml(*_xml);
FindMatchingHeaderfiles(cFiles, otherFiles);
// Create 2 virtual folders: src and include
@ -469,10 +468,14 @@ void cmExtraCodeLiteGenerator::CreateProjectSourceEntries(
xml.EndElement(); // ResourceCompiler
xml.StartElement("General");
std::string outputPath = mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
std::string outputPath =
mf->GetSafeDefinition("CMAKE_RUNTIME_OUTPUT_DIRECTORY");
if (outputPath.empty()) {
outputPath = mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
}
std::string relapath;
if (!outputPath.empty()) {
relapath = cmSystemTools::RelativePath(this->WorkspacePath, outputPath);
relapath = cmSystemTools::RelativePath(projectPath, outputPath);
xml.Attribute("OutputFile", relapath + "/$(ProjectName)");
} else {
xml.Attribute("OutputFile", "$(IntermediateDirectory)/$(ProjectName)");