Skip to content

#231 Compile database may content response files #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2022
Merged

#231 Compile database may content response files #305

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dc72bd
#231 Compile database may content response files
alexey-utkin Jun 30, 2022
3ae6b56
Update UserProjectConfiguration.cpp
ladisgin Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions server/src/building/UserProjectConfiguration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include "environment/EnvironmentPaths.h"
#include "tasks/ShellExecTask.h"
#include "utils/Copyright.h"
#include "utils/FileSystemUtils.h"
#include "utils/ExecUtils.h"
#include "utils/FileSystemUtils.h"
#include "utils/LogUtils.h"
#include "utils/MakefileUtils.h"
#include "utils/StringUtils.h"
Expand All @@ -32,6 +32,19 @@ Status UserProjectConfiguration::RunBuildDirectoryCreation(const fs::path &build
return Status::OK;
}

static const std::vector<std::string> CMAKE_MANDATORY_OPTIONS = {
"-DCMAKE_ASM_USE_RESPONSE_FILE_FOR_INCLUDES=OFF",
"-DCMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES=OFF",
"-DCMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES=OFF",

"-DCMAKE_ASM_USE_RESPONSE_FILE_FOR_OBJECTS=OFF",
"-DCMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS=OFF",
"-DCMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS=OFF",

"-DCMAKE_ASM_USE_RESPONSE_FILE_FOR_LIBRARIES=OFF",
"-DCMAKE_C_USE_RESPONSE_FILE_FOR_LIBRARIES=OFF",
"-DCMAKE_CXX_USE_RESPONSE_FILE_FOR_LIBRARIES=OFF",
};

Status
UserProjectConfiguration::RunProjectConfigurationCommands(const fs::path &buildDirPath,
Expand All @@ -40,8 +53,16 @@ UserProjectConfiguration::RunProjectConfigurationCommands(const fs::path &buildD
ProjectConfigWriter const &writer) {
try {
fs::path bearShPath = createBearShScript(buildDirPath);
cmakeOptions.emplace_back("..");
ShellExecTask::ExecutionParameters cmakeParams(Paths::getCMake(), cmakeOptions);

std::vector<std::string> cmakeOptionsWithMandatory = CMAKE_MANDATORY_OPTIONS;
for (const std::string &op : cmakeOptions) {
if (op.find("_USE_RESPONSE_FILE_FOR_") == std::string::npos) {
cmakeOptionsWithMandatory.emplace_back(op);
}
}
cmakeOptionsWithMandatory.emplace_back("..");

ShellExecTask::ExecutionParameters cmakeParams(Paths::getCMake(), cmakeOptionsWithMandatory);
ShellExecTask::ExecutionParameters bearMakeParams(Paths::getBear(),
{Paths::getMake(), MakefileUtils::threadFlag()});

Expand Down