kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'install-command-cleanup'

Browse Source 
982b5d9 cmInstallCommand: Fix line length for style
a64b618 cmInstallCommand: Remove duplicated sentence from docs
01ddef8 cmInstallCommand: Fix indentation error
This commit is contained in:
David Cole 2012-01-25 11:15:03 -05:00 committed by CMake Topic Stage
commit cef75ca909
2 changed files with 101 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmInstallCommand.cxx
View File

@ -602,11 +602,11 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
break; break;
} }
// These well-known sets of files are installed *automatically* for FRAMEWORK // These well-known sets of files are installed *automatically* for
// SHARED library targets on the Mac as part of installing the FRAMEWORK. // FRAMEWORK SHARED library targets on the Mac as part of installing the
// For other target types or on other platforms, they are not installed // FRAMEWORK. For other target types or on other platforms, they are not
// automatically and so we need to create install files generators for them. // installed automatically and so we need to create install files
// // generators for them.
bool createInstallGeneratorsForTargetFileSets = true; bool createInstallGeneratorsForTargetFileSets = true;
if(target.IsFrameworkOnApple()) if(target.IsFrameworkOnApple())
@ -630,8 +630,8 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
// Create the files install generator. // Create the files install generator.
if (!privateHeaderArgs.GetDestination().empty()) if (!privateHeaderArgs.GetDestination().empty())
{ {
privateHeaderGenerator = CreateInstallFilesGenerator(absFiles, privateHeaderGenerator =
privateHeaderArgs, false); CreateInstallFilesGenerator(absFiles, privateHeaderArgs, false);
} }
else else
{ {
@ -656,8 +656,8 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
// Create the files install generator. // Create the files install generator.
if (!publicHeaderArgs.GetDestination().empty()) if (!publicHeaderArgs.GetDestination().empty())
{ {
publicHeaderGenerator = CreateInstallFilesGenerator(absFiles, publicHeaderGenerator =
publicHeaderArgs, false); CreateInstallFilesGenerator(absFiles, publicHeaderArgs, false);
} }
else else
{ {

4
Source/cmInstallCommand.h
View File

@ -168,9 +168,7 @@ public:
"On non-DLL platforms mySharedLib will be installed to <prefix>/lib " "On non-DLL platforms mySharedLib will be installed to <prefix>/lib "
"and /some/full/path. On DLL platforms the mySharedLib DLL will be " "and /some/full/path. On DLL platforms the mySharedLib DLL will be "
"installed to <prefix>/bin and /some/full/path and its import library " "installed to <prefix>/bin and /some/full/path and its import library "
"will be installed to <prefix>/lib/static and /some/full/path. " "will be installed to <prefix>/lib/static and /some/full/path."
"On non-DLL platforms mySharedLib will be installed to <prefix>/lib "
"and /some/full/path."
"\n" "\n"
"The EXPORT option associates the installed target files with an " "The EXPORT option associates the installed target files with an "
"export called <export-name>. " "export called <export-name>. "