Skip to content
GitLab
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
c337c7e2
Commit
c337c7e2
authored
Mar 18, 2012
by
Peter Kuemmel
Committed by
Brad King
Mar 19, 2012
Browse files
Ninja: Fix <OBJECT_DIR> substitution
Don't forget the subdirectories.
parent
572994bd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Source/cmNinjaNormalTargetGenerator.cxx
View file @
c337c7e2
...
...
@@ -131,7 +131,10 @@ cmNinjaNormalTargetGenerator
vars
.
CMTarget
=
this
->
GetTarget
();
vars
.
Language
=
this
->
TargetLinkLanguage
;
vars
.
Objects
=
"$in"
;
std
::
string
objdir
=
cmake
::
GetCMakeFilesDirectoryPostSlash
();
std
::
string
objdir
=
this
->
GetLocalGenerator
()
->
GetHomeRelativeOutputPath
();
objdir
+=
objdir
.
empty
()
?
""
:
"/"
;
objdir
+=
cmake
::
GetCMakeFilesDirectoryPostSlash
();
objdir
+=
this
->
GetTargetName
();
objdir
+=
".dir"
;
objdir
=
this
->
GetLocalGenerator
()
->
Convert
(
objdir
.
c_str
(),
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment