forked from qt-creator/qt-creator
CMakePM: Add project CMake settings support
This is useful if projects do not to have "Auto Run" CMake or want to have Junctions enabled. Change-Id: I4a636e7bf64fe2d29d15d39fe9aa46807684c716 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -704,7 +704,7 @@ static void addCompileGroups(ProjectNode *targetRoot,
|
||||
if (buildDirQmldirOrRcc || otherDirQmldirOrMetatypes || buildDirPluginCpp)
|
||||
node->setIsGenerated(true);
|
||||
|
||||
const bool showSourceFolders = settings().showSourceSubFolders()
|
||||
const bool showSourceFolders = settings(targetRoot->getProject()).showSourceSubFolders()
|
||||
&& defaultCMakeSourceGroupFolder(td.sourceGroups[si.sourceGroup]);
|
||||
|
||||
// Where does the file node need to go?
|
||||
@@ -718,7 +718,7 @@ static void addCompileGroups(ProjectNode *targetRoot,
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < sourceGroupFileNodes.size(); ++i) {
|
||||
const bool showSourceFolders = settings().showSourceSubFolders()
|
||||
const bool showSourceFolders = settings(targetRoot->getProject()).showSourceSubFolders()
|
||||
&& defaultCMakeSourceGroupFolder(td.sourceGroups[i]);
|
||||
|
||||
std::vector<std::unique_ptr<FileNode>> ¤t = sourceGroupFileNodes[i];
|
||||
|
||||
Reference in New Issue
Block a user