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
d69c2c58
Commit
d69c2c58
authored
Mar 20, 2012
by
David Cole
Committed by
Kitware Robot
Mar 20, 2012
Browse files
Merge topic 'ninja-generator'
c337c7e2
Ninja: Fix <OBJECT_DIR> substitution
parents
31c0bc02
c337c7e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Source/cmNinjaNormalTargetGenerator.cxx
View file @
d69c2c58
...
...
@@ -141,7 +141,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