Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
17e13f0a
Commit
17e13f0a
authored
May 23, 2015
by
Stephen Kelly
Browse files
cmMakefile: Simplify CMP0000 handling.
parent
d3bb5da9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Source/cmMakefile.cxx
View file @
17e13f0a
...
...
@@ -519,8 +519,10 @@ bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
{
this
->
AddDefinition
(
"CMAKE_PARENT_LIST_FILE"
,
listfile
);
std
::
string
curSrc
=
this
->
GetCurrentSourceDirectory
();
return
this
->
ReadListFile
(
listfile
,
true
,
curSrc
==
this
->
GetHomeDirectory
());
bool
result
=
this
->
ReadListFile
(
listfile
,
true
,
curSrc
==
this
->
GetHomeDirectory
());
this
->
EnforceDirectoryLevelRules
();
return
result
;
}
bool
cmMakefile
::
ReadDependentFile
(
const
char
*
listfile
,
bool
noPolicyScope
)
...
...
@@ -619,13 +621,6 @@ bool cmMakefile::ReadListFileInternal(const char* filenametoread,
}
}
// If this is the directory-level CMakeLists.txt file then perform
// some extra checks.
if
(
this
->
ListFileStack
.
size
()
==
1
)
{
this
->
EnforceDirectoryLevelRules
();
}
return
true
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment