diff options
author | Carsten Rudolph <18394207+crud89@users.noreply.github.com> | 2022-01-21 16:43:17 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2022-01-22 11:35:38 (GMT) |
commit | 193b8fca52b5665387dbc7f3199981d9e6cd4b79 (patch) | |
tree | e3a5d14692f37645b9b7a03fc240dd0f25bace48 /Source/cmGlobalVisualStudio10Generator.cxx | |
parent | 6a1010349355354e27015a004f5620b77993b91c (diff) | |
download | CMake-193b8fca52b5665387dbc7f3199981d9e6cd4b79.zip CMake-193b8fca52b5665387dbc7f3199981d9e6cd4b79.tar.gz CMake-193b8fca52b5665387dbc7f3199981d9e6cd4b79.tar.bz2 |
cmBuildOptions: Split build arguments into separate object.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
-rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index d7bc05d..5634def 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -1099,7 +1099,8 @@ std::vector<cmGlobalGenerator::GeneratedMakeCommand> cmGlobalVisualStudio10Generator::GenerateBuildCommand( const std::string& makeProgram, const std::string& projectName, const std::string& projectDir, std::vector<std::string> const& targetNames, - const std::string& config, bool fast, int jobs, bool verbose, + const std::string& config, int jobs, bool verbose, + const cmBuildOptions& buildOptions, std::vector<std::string> const& makeOptions) { std::vector<GeneratedMakeCommand> makeCommands; @@ -1145,8 +1146,8 @@ cmGlobalVisualStudio10Generator::GenerateBuildCommand( if (useDevEnv) { // Use devenv to build solutions containing Intel Fortran projects. return cmGlobalVisualStudio7Generator::GenerateBuildCommand( - makeProgram, projectName, projectDir, targetNames, config, fast, jobs, - verbose, makeOptions); + makeProgram, projectName, projectDir, targetNames, config, jobs, verbose, + buildOptions, makeOptions); } std::vector<std::string> realTargetNames = targetNames; @@ -1178,8 +1179,9 @@ cmGlobalVisualStudio10Generator::GenerateBuildCommand( cmSystemTools::ConvertToUnixSlashes(targetProject); } } - makeCommand.Add(std::move(targetProject)); + makeCommand.Add(targetProject); } + std::string configArg = "/p:Configuration="; if (!config.empty()) { configArg += config; |