echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'ninja-nvhpc-fortran-Werror'

Browse Source 
0f6a1dd3ed Ninja: Revert "Exclude NVHPC -Werror flags during Fortran preprocessing"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8435
This commit is contained in:
Brad King 2023-04-27 13:40:13 +00:00 committed by Kitware Robot
commit 582c17bdd2
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/Compiler/NVHPC-Fortran.cmake
View File

@ -1,4 +1,3 @@
include(Compiler/PGI-Fortran)
include(Compiler/NVHPC)
__compiler_nvhpc(Fortran)
set(CMAKE_Fortran_PREPROCESS_SOURCE_EXCLUDE_FLAGS_REGEX "(^| )-Werror([=,][a-z][a-z-]+)?( |$)")

25
Source/cmNinjaTargetGenerator.cxx
View File

@ -21,8 +21,6 @@
#include <cm3p/json/value.h>
#include <cm3p/json/writer.h>
#include "cmsys/RegularExpression.hxx"
#include "cmComputeLinkInformation.h"
#include "cmCustomCommandGenerator.h"
#include "cmDyndepCollation.h"
@ -1262,7 +1260,6 @@ namespace {
cmNinjaBuild GetScanBuildStatement(const std::string& ruleName,
const std::string& ppFileName,
bool compilePP, bool compilePPWithDefines,
cmValue ppExcludeFlagsRegex,
cmNinjaBuild& objBuild, cmNinjaVars& vars,
const std::string& objectFileName,
cmLocalGenerator* lg)
@ -1291,20 +1288,6 @@ cmNinjaBuild GetScanBuildStatement(const std::string& ruleName,
// Scanning and compilation generally use the same flags.
scanBuild.Variables["FLAGS"] = vars["FLAGS"];
// Exclude flags not valid during preprocessing.
if (compilePP && !ppExcludeFlagsRegex.IsEmpty()) {
std::string in = std::move(scanBuild.Variables["FLAGS"]);
std::string out;
cmsys::RegularExpression regex(*ppExcludeFlagsRegex);
std::string::size_type pos = 0;
while (regex.find(in.c_str() + pos)) {
out = cmStrCat(out, in.substr(pos, regex.start()), ' ');
pos += regex.end();
}
out = cmStrCat(out, in.substr(pos));
scanBuild.Variables["FLAGS"] = std::move(out);
}
if (compilePP && !compilePPWithDefines) {
// Move preprocessor definitions to the scan/preprocessor build statement.
std::swap(scanBuild.Variables["DEFINES"], vars["DEFINES"]);
@ -1529,22 +1512,18 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
std::string scanRuleName;
std::string ppFileName;
cmValue ppExcludeFlagsRegex;
if (compilePP) {
scanRuleName = this->LanguagePreprocessAndScanRule(language, config);
ppFileName = this->ConvertToNinjaPath(
this->GetPreprocessedFilePath(source, config));
ppExcludeFlagsRegex = this->Makefile->GetDefinition(cmStrCat(
"CMAKE_", language, "_PREPROCESS_SOURCE_EXCLUDE_FLAGS_REGEX"));
} else {
scanRuleName = this->LanguageScanRule(language, config);
ppFileName = cmStrCat(objectFileName, ".ddi.i");
}
cmNinjaBuild ppBuild = GetScanBuildStatement(
scanRuleName, ppFileName, compilePP, compilePPWithDefines,
ppExcludeFlagsRegex, objBuild, vars, objectFileName,
this->LocalGenerator);
scanRuleName, ppFileName, compilePP, compilePPWithDefines, objBuild,
vars, objectFileName, this->LocalGenerator);
if (compilePP) {
// In case compilation requires flags that are incompatible with