Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
d231c31b
Commit
d231c31b
authored
Oct 17, 2015
by
Stephen Kelly
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Export: Port internal API to cmGeneratorTarget.
parent
e6661282
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
9 deletions
+10
-9
Source/cmExportBuildFileGenerator.cxx
Source/cmExportBuildFileGenerator.cxx
+1
-1
Source/cmExportFileGenerator.cxx
Source/cmExportFileGenerator.cxx
+4
-4
Source/cmExportFileGenerator.h
Source/cmExportFileGenerator.h
+3
-2
Source/cmExportInstallFileGenerator.cxx
Source/cmExportInstallFileGenerator.cxx
+2
-2
No files found.
Source/cmExportBuildFileGenerator.cxx
View file @
d231c31b
...
...
@@ -174,7 +174,7 @@ cmExportBuildFileGenerator
// properties);
// Generate code in the export file.
this
->
GenerateImportPropertyCode
(
os
,
config
,
target
->
Target
,
this
->
GenerateImportPropertyCode
(
os
,
config
,
target
,
properties
);
}
}
...
...
Source/cmExportFileGenerator.cxx
View file @
d231c31b
...
...
@@ -1108,13 +1108,13 @@ cmExportFileGenerator
void
cmExportFileGenerator
::
GenerateImportPropertyCode
(
std
::
ostream
&
os
,
const
std
::
string
&
config
,
cmTarget
const
*
target
,
cm
Generator
Target
const
*
target
,
ImportPropertyMap
const
&
properties
)
{
// Construct the imported target name.
std
::
string
targetName
=
this
->
Namespace
;
targetName
+=
target
->
GetExportName
();
targetName
+=
target
->
Target
->
GetExportName
();
// Set the import properties.
os
<<
"# Import target
\"
"
<<
targetName
<<
"
\"
for configuration
\"
"
...
...
@@ -1228,13 +1228,13 @@ cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os)
//----------------------------------------------------------------------------
void
cmExportFileGenerator
::
GenerateImportedFileChecksCode
(
std
::
ostream
&
os
,
cmTarget
*
target
,
::
GenerateImportedFileChecksCode
(
std
::
ostream
&
os
,
cm
Generator
Target
*
target
,
ImportPropertyMap
const
&
properties
,
const
std
::
set
<
std
::
string
>&
importedLocations
)
{
// Construct the imported target name.
std
::
string
targetName
=
this
->
Namespace
;
targetName
+=
target
->
GetExportName
();
targetName
+=
target
->
Target
->
GetExportName
();
os
<<
"list(APPEND _IMPORT_CHECK_TARGETS "
<<
targetName
<<
" )
\n
"
"list(APPEND _IMPORT_CHECK_FILES_FOR_"
<<
targetName
<<
" "
;
...
...
Source/cmExportFileGenerator.h
View file @
d231c31b
...
...
@@ -78,9 +78,10 @@ protected:
void
GenerateImportTargetCode
(
std
::
ostream
&
os
,
cmGeneratorTarget
const
*
target
);
void
GenerateImportPropertyCode
(
std
::
ostream
&
os
,
const
std
::
string
&
config
,
cmTarget
const
*
target
,
cm
Generator
Target
const
*
target
,
ImportPropertyMap
const
&
properties
);
void
GenerateImportedFileChecksCode
(
std
::
ostream
&
os
,
cmTarget
*
target
,
void
GenerateImportedFileChecksCode
(
std
::
ostream
&
os
,
cmGeneratorTarget
*
target
,
ImportPropertyMap
const
&
properties
,
const
std
::
set
<
std
::
string
>&
importedLocations
);
void
GenerateImportedFileCheckLoop
(
std
::
ostream
&
os
);
...
...
Source/cmExportInstallFileGenerator.cxx
View file @
d231c31b
...
...
@@ -375,8 +375,8 @@ cmExportInstallFileGenerator
// properties);
// Generate code in the export file.
this
->
GenerateImportPropertyCode
(
os
,
config
,
gtgt
->
Target
,
properties
);
this
->
GenerateImportedFileChecksCode
(
os
,
gtgt
->
Target
,
properties
,
this
->
GenerateImportPropertyCode
(
os
,
config
,
gtgt
,
properties
);
this
->
GenerateImportedFileChecksCode
(
os
,
gtgt
,
properties
,
importedLocations
);
}
}
...
...
Brad King
@brad.king
mentioned in commit
9afbb733
·
Feb 02, 2016
mentioned in commit
9afbb733
mentioned in commit 9afbb733ec2a55424e6c25c6afa7fdd14219d6b1
Toggle commit list
Write
Preview
Markdown
is supported
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