Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mattias Ellert
CMake
Commits
186c9bff
Commit
186c9bff
authored
3 years ago
by
Brad King
Browse files
Options
Downloads
Patches
Plain Diff
NMake: Check nmake version for support of UTF-8
NMake version 9 and above support UTF-8 encoded makefiles with a BOM.
parent
8a4f536b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Source/cmGlobalNMakeMakefileGenerator.cxx
+7
-0
7 additions, 0 deletions
Source/cmGlobalNMakeMakefileGenerator.cxx
Source/cmGlobalNMakeMakefileGenerator.h
+2
-0
2 additions, 0 deletions
Source/cmGlobalNMakeMakefileGenerator.h
with
9 additions
and
0 deletions
Source/cmGlobalNMakeMakefileGenerator.cxx
+
7
−
0
View file @
186c9bff
...
@@ -63,11 +63,18 @@ bool cmGlobalNMakeMakefileGenerator::FindMakeProgram(cmMakefile* mf)
...
@@ -63,11 +63,18 @@ bool cmGlobalNMakeMakefileGenerator::FindMakeProgram(cmMakefile* mf)
"Program Maintenance Utility Version ([1-9][0-9.]+)"
);
"Program Maintenance Utility Version ([1-9][0-9.]+)"
);
if
(
regex
.
find
(
err
))
{
if
(
regex
.
find
(
err
))
{
this
->
NMakeVersion
=
regex
.
match
(
1
);
this
->
NMakeVersion
=
regex
.
match
(
1
);
this
->
CheckNMakeFeatures
();
}
}
}
}
return
true
;
return
true
;
}
}
void
cmGlobalNMakeMakefileGenerator
::
CheckNMakeFeatures
()
{
this
->
NMakeSupportsUTF8
=
!
cmSystemTools
::
VersionCompare
(
cmSystemTools
::
OP_LESS
,
this
->
NMakeVersion
.
c_str
(),
"9"
);
}
void
cmGlobalNMakeMakefileGenerator
::
GetDocumentation
(
void
cmGlobalNMakeMakefileGenerator
::
GetDocumentation
(
cmDocumentationEntry
&
entry
)
cmDocumentationEntry
&
entry
)
{
{
...
...
This diff is collapsed.
Click to expand it.
Source/cmGlobalNMakeMakefileGenerator.h
+
2
−
0
View file @
186c9bff
...
@@ -55,8 +55,10 @@ protected:
...
@@ -55,8 +55,10 @@ protected:
void
PrintBuildCommandAdvice
(
std
::
ostream
&
os
,
int
jobs
)
const
override
;
void
PrintBuildCommandAdvice
(
std
::
ostream
&
os
,
int
jobs
)
const
override
;
private
:
private
:
bool
NMakeSupportsUTF8
=
false
;
std
::
string
NMakeVersion
;
std
::
string
NMakeVersion
;
bool
FindMakeProgram
(
cmMakefile
*
mf
)
override
;
bool
FindMakeProgram
(
cmMakefile
*
mf
)
override
;
void
CheckNMakeFeatures
();
void
PrintCompilerAdvice
(
std
::
ostream
&
os
,
std
::
string
const
&
lang
,
void
PrintCompilerAdvice
(
std
::
ostream
&
os
,
std
::
string
const
&
lang
,
const
char
*
envVar
)
const
override
;
const
char
*
envVar
)
const
override
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment