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
Bill Hoffman
CMake
Commits
f716460e
Commit
f716460e
authored
Oct 06, 2015
by
Stephen Kelly
Browse files
cmMakefile: Move invokation to initialize snapshot.
parent
256bf887
Changes
1
Show whitespace changes
Inline
Side-by-side
Source/cmMakefile.cxx
View file @
f716460e
...
@@ -1472,8 +1472,6 @@ void cmMakefile::AddLinkLibrary(const std::string& lib)
...
@@ -1472,8 +1472,6 @@ void cmMakefile::AddLinkLibrary(const std::string& lib)
void
cmMakefile
::
InitializeFromParent
(
cmMakefile
*
parent
)
void
cmMakefile
::
InitializeFromParent
(
cmMakefile
*
parent
)
{
{
this
->
StateSnapshot
.
InitializeFromParent
();
this
->
AddDefinition
(
"CMAKE_CURRENT_SOURCE_DIR"
,
this
->
AddDefinition
(
"CMAKE_CURRENT_SOURCE_DIR"
,
this
->
GetCurrentSourceDirectory
());
this
->
GetCurrentSourceDirectory
());
this
->
AddDefinition
(
"CMAKE_CURRENT_BINARY_DIR"
,
this
->
AddDefinition
(
"CMAKE_CURRENT_BINARY_DIR"
,
...
@@ -1755,6 +1753,9 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
...
@@ -1755,6 +1753,9 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
// set the subdirs start dirs
// set the subdirs start dirs
subMf
->
SetCurrentSourceDirectory
(
srcPath
);
subMf
->
SetCurrentSourceDirectory
(
srcPath
);
subMf
->
SetCurrentBinaryDirectory
(
binPath
);
subMf
->
SetCurrentBinaryDirectory
(
binPath
);
subMf
->
StateSnapshot
.
InitializeFromParent
();
if
(
excludeFromAll
)
if
(
excludeFromAll
)
{
{
subMf
->
SetProperty
(
"EXCLUDE_FROM_ALL"
,
"TRUE"
);
subMf
->
SetProperty
(
"EXCLUDE_FROM_ALL"
,
"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