Commit 52409f95 authored by Igor Kushnir's avatar Igor Kushnir
Browse files

Revert "Run configure once to apply cmake preferences for CMake file api usage"

This reverts commit 4887d28e.

This commit prevented KDevelop from storing CMake Settings changes.

BUG: 431194, 438212
FIXED-IN: 5.6.3
parent a554d57c
Pipeline #78913 passed with stage
in 31 minutes and 23 seconds
......@@ -39,7 +39,6 @@
#include "cmakebuilderconfig.h"
#include <debug.h>
#include <cmakeutils.h>
#include <cmakefileapi.h>
#include <interfaces/iproject.h>
#include <project/interfaces/ibuildsystemmanager.h>
#include <project/interfaces/iprojectbuilder.h>
......@@ -385,13 +384,6 @@ void CMakePreferences::removeBuildDir()
void CMakePreferences::configure()
{
if (CMake::FileApi::supported(CMake::currentCMakeExecutable(m_project).toLocalFile())) {
// the file api already does a configure internally when we reload the model
// so don't do it twice
m_project->reloadModel();
return;
}
IProjectBuilder *b=m_project->buildSystemManager()->builder();
KJob* job=b->configure(m_project);
if( m_currentModel ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment