kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally

This commit is contained in:
Stephen Kelly 2016-10-06 18:35:02 +02:00 committed by Brad King
parent f59e877929
commit 80574a38e6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
View File

@ -3,5 +3,6 @@ CMAKE_CODELITE_USE_TARGETS
Change the way the CodeLite generator creates projectfiles. Change the way the CodeLite generator creates projectfiles.
If this variable is set to ``ON`` the generator creates projectfiles If this variable evaluates to ``ON`` at the end of the top-level
based on targets rather than projects. ``CMakeLists.txt`` file, the generator creates projectfiles based on targets
rather than projects.

4
Source/cmExtraCodeLiteGenerator.cxx
View File

@ -60,7 +60,6 @@ void cmExtraCodeLiteGenerator::Generate()
// loop projects and locate the root project. // loop projects and locate the root project.
// and extract the information for creating the worspace // and extract the information for creating the worspace
// root makefile // root makefile
const cmMakefile* rmf = CM_NULLPTR;
for (std::map<std::string, std::vector<cmLocalGenerator*> >::const_iterator for (std::map<std::string, std::vector<cmLocalGenerator*> >::const_iterator
it = projectMap.begin(); it = projectMap.begin();
it != projectMap.end(); ++it) { it != projectMap.end(); ++it) {
@ -75,7 +74,6 @@ void cmExtraCodeLiteGenerator::Generate()
workspaceFileName = workspaceOutputDir + "/"; workspaceFileName = workspaceOutputDir + "/";
workspaceFileName += workspaceProjectName + ".workspace"; workspaceFileName += workspaceProjectName + ".workspace";
this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory(); this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();
rmf = it->second[0]->GetMakefile();
; ;
break; break;
} }
@ -89,7 +87,7 @@ void cmExtraCodeLiteGenerator::Generate()
xml.Attribute("Name", workspaceProjectName); xml.Attribute("Name", workspaceProjectName);
bool const targetsAreProjects = bool const targetsAreProjects =
rmf && rmf->IsOn("CMAKE_CODELITE_USE_TARGETS"); this->GlobalGenerator->GlobalSettingIsOn("CMAKE_CODELITE_USE_TARGETS");
std::vector<std::string> ProjectNames; std::vector<std::string> ProjectNames;
if (targetsAreProjects) { if (targetsAreProjects) {