[cmake-commits] king committed cmInstallDirectoryGenerator.cxx 1.3
1.4 cmInstallExportGenerator.cxx 1.2 1.3
cmInstallFilesGenerator.cxx 1.7 1.8 cmInstallGenerator.cxx 1.10
1.11 cmInstallGenerator.h 1.9 1.10 cmInstallTargetGenerator.cxx
1.38 1.39 cmInstallTargetGenerator.h 1.14 1.15
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jun 28 16:11:20 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv20121
Modified Files:
cmInstallDirectoryGenerator.cxx cmInstallExportGenerator.cxx
cmInstallFilesGenerator.cxx cmInstallGenerator.cxx
cmInstallGenerator.h cmInstallTargetGenerator.cxx
cmInstallTargetGenerator.h
Log Message:
ENH: First step of install script generator cleanup. Each configuration to be installed is now separately handled instead of using variables to store per-configuration names. For targets the component and configuration install-time tests are now done in the install script instead of in the FILE(INSTALL) command. This cleans things up like not trying to strip a file that was optionally not installed. It also simplifies the code for install_name adjustment on OSX. This commit is surrounded by the tags CMake-InstallGeneratorCleanup1-pre and CMake-InstallGeneratorCleanup1-post.
Index: cmInstallGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallGenerator.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cmInstallGenerator.h 19 Jun 2007 15:11:06 -0000 1.9
+++ cmInstallGenerator.h 28 Jun 2007 20:11:18 -0000 1.10
@@ -37,7 +37,8 @@
static void AddInstallRule(
std::ostream& os, const char* dest, int type,
- const char* file, bool optional = false,
+ std::vector<std::string> const& files,
+ bool optional = false,
const char* properties = 0,
const char* permissions_file = 0,
const char* permissions_dir = 0,
Index: cmInstallGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallGenerator.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmInstallGenerator.cxx 21 Aug 2006 20:55:03 -0000 1.10
+++ cmInstallGenerator.cxx 28 Jun 2007 20:11:18 -0000 1.11
@@ -52,7 +52,7 @@
std::ostream& os,
const char* dest,
int type,
- const char* file,
+ std::vector<std::string> const& files,
bool optional /* = false */,
const char* properties /* = 0 */,
const char* permissions_file /* = 0 */,
@@ -110,7 +110,24 @@
{
os << " COMPONENTS \"" << component << "\"";
}
- os << " FILES \"" << file << "\"";
+ os << " FILES";
+ if(files.size() == 1)
+ {
+ os << " \"" << files[0] << "\"";
+ }
+ else
+ {
+ for(std::vector<std::string>::const_iterator fi = files.begin();
+ fi != files.end(); ++fi)
+ {
+ os << "\n \"" << *fi << "\"";
+ }
+ os << "\n ";
+ if(!(literal_args && *literal_args))
+ {
+ os << " ";
+ }
+ }
if(literal_args && *literal_args)
{
os << literal_args;
Index: cmInstallTargetGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cmInstallTargetGenerator.h 19 Jun 2007 15:11:06 -0000 1.14
+++ cmInstallTargetGenerator.h 28 Jun 2007 20:11:18 -0000 1.15
@@ -44,19 +44,15 @@
protected:
virtual void GenerateScript(std::ostream& os);
- void PrepareScriptReference(std::ostream& os, cmTarget* target,
- const char* place, bool useConfigDir,
- bool implib, bool useSOName);
- std::string GetScriptReference(cmTarget* target, const char* place,
- bool implib, bool useSOName);
- void AddInstallNamePatchRule(std::ostream& os, const char* destination);
- void AddStripRule(std::ostream& os,
- cmTarget::TargetType type,
- const std::string& quotedFullDestinationFilename,
- bool optional);
- void AddRanlibRule(std::ostream& os,
- cmTarget::TargetType type,
- const std::string& quotedFullDestinationFilename);
+ void GenerateScriptForConfig(std::ostream& os,
+ const char* fromDir,
+ const char* config);
+ void AddInstallNamePatchRule(std::ostream& os, const char* config,
+ const std::string& toFullPath);
+ void AddStripRule(std::ostream& os, cmTarget::TargetType type,
+ const std::string& toFullPath);
+ void AddRanlibRule(std::ostream& os, cmTarget::TargetType type,
+ const std::string& toFullPath);
cmTarget* Target;
bool ImportLibrary;
Index: cmInstallDirectoryGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallDirectoryGenerator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmInstallDirectoryGenerator.cxx 19 Jun 2007 15:11:06 -0000 1.3
+++ cmInstallDirectoryGenerator.cxx 28 Jun 2007 20:11:18 -0000 1.4
@@ -44,18 +44,15 @@
void cmInstallDirectoryGenerator::GenerateScript(std::ostream& os)
{
// Write code to install the directories.
- for(std::vector<std::string>::const_iterator di = this->Directories.begin();
- di != this->Directories.end(); ++di)
- {
- bool not_optional = false;
- const char* no_properties = 0;
- const char* no_rename = 0;
- this->AddInstallRule(os, this->Destination.c_str(),
- cmTarget::INSTALL_DIRECTORY, di->c_str(),
- not_optional, no_properties,
- this->FilePermissions.c_str(),
- this->DirPermissions.c_str(),
- this->Configurations, this->Component.c_str(),
- no_rename, this->LiteralArguments.c_str());
- }
+ bool not_optional = false;
+ const char* no_properties = 0;
+ const char* no_rename = 0;
+ this->AddInstallRule(os, this->Destination.c_str(),
+ cmTarget::INSTALL_DIRECTORY,
+ this->Directories,
+ not_optional, no_properties,
+ this->FilePermissions.c_str(),
+ this->DirPermissions.c_str(),
+ this->Configurations, this->Component.c_str(),
+ no_rename, this->LiteralArguments.c_str());
}
Index: cmInstallFilesGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesGenerator.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cmInstallFilesGenerator.cxx 19 Jun 2007 15:11:06 -0000 1.7
+++ cmInstallFilesGenerator.cxx 28 Jun 2007 20:11:18 -0000 1.8
@@ -43,19 +43,16 @@
void cmInstallFilesGenerator::GenerateScript(std::ostream& os)
{
// Write code to install the files.
- for(std::vector<std::string>::const_iterator fi = this->Files.begin();
- fi != this->Files.end(); ++fi)
- {
- const char* no_properties = 0;
- const char* no_dir_permissions = 0;
- this->AddInstallRule(os, this->Destination.c_str(),
- (this->Programs
- ? cmTarget::INSTALL_PROGRAMS
- : cmTarget::INSTALL_FILES), fi->c_str(),
- this->Optional, no_properties,
- this->FilePermissions.c_str(), no_dir_permissions,
- this->Configurations,
- this->Component.c_str(),
- this->Rename.c_str());
- }
+ const char* no_properties = 0;
+ const char* no_dir_permissions = 0;
+ this->AddInstallRule(os, this->Destination.c_str(),
+ (this->Programs
+ ? cmTarget::INSTALL_PROGRAMS
+ : cmTarget::INSTALL_FILES),
+ this->Files,
+ this->Optional, no_properties,
+ this->FilePermissions.c_str(), no_dir_permissions,
+ this->Configurations,
+ this->Component.c_str(),
+ this->Rename.c_str());
}
Index: cmInstallExportGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallExportGenerator.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmInstallExportGenerator.cxx 19 Jun 2007 18:57:55 -0000 1.2
+++ cmInstallExportGenerator.cxx 28 Jun 2007 20:11:18 -0000 1.3
@@ -222,8 +222,10 @@
}
// install rule for the file created above
+ std::vector<std::string> exportFile;
+ exportFile.push_back(this->ExportFilename);
this->AddInstallRule(os, this->Destination.c_str(), cmTarget::INSTALL_FILES,
- this->ExportFilename.c_str(), false, 0,
+ exportFile, false, 0,
this->FilePermissions.c_str(), 0, this->Configurations,
0, this->Filename.c_str(), 0);
Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- cmInstallTargetGenerator.cxx 19 Jun 2007 15:11:06 -0000 1.38
+++ cmInstallTargetGenerator.cxx 28 Jun 2007 20:11:18 -0000 1.39
@@ -21,6 +21,12 @@
#include "cmMakefile.h"
#include "cmake.h"
+// TODO:
+// - Fix indentation of generated code
+// - Consolidate component/configuration checks across multiple
+// install generators
+// - Skip IF(EXISTS) checks if nothing is done with the installed file
+
//----------------------------------------------------------------------------
cmInstallTargetGenerator
::cmInstallTargetGenerator(cmTarget& t, const char* dest, bool implib,
@@ -43,6 +49,13 @@
//----------------------------------------------------------------------------
void cmInstallTargetGenerator::GenerateScript(std::ostream& os)
{
+ // Begin this block of installation.
+ std::string component_test = "NOT CMAKE_INSTALL_COMPONENT OR "
+ "\"${CMAKE_INSTALL_COMPONENT}\" MATCHES \"^(";
+ component_test += this->Component;
+ component_test += ")$\"";
+ os << "IF(" << component_test << ")\n";
+
// Compute the build tree directory from which to copy the target.
std::string fromDir;
if(this->Target->NeedRelinkBeforeInstall())
@@ -57,78 +70,90 @@
fromDir += "/";
}
- // Write variable settings to do per-configuration references.
- this->PrepareScriptReference(os, this->Target, "BUILD", true, this->ImportLibrary, false);
+ // Generate a portion of the script for each configuration.
+ if(this->ConfigurationTypes->empty())
+ {
+ this->GenerateScriptForConfig(os, fromDir.c_str(),
+ this->ConfigurationName);
+ }
+ else
+ {
+ for(std::vector<std::string>::const_iterator i =
+ this->ConfigurationTypes->begin();
+ i != this->ConfigurationTypes->end(); ++i)
+ {
+ this->GenerateScriptForConfig(os, fromDir.c_str(), i->c_str());
+ }
+ }
- // Create the per-configuration reference.
- std::string fromName = this->GetScriptReference(this->Target, "BUILD",
- this->ImportLibrary, false);
- std::string fromFile = fromDir;
- fromFile += fromName;
+ // End this block of installation.
+ os << "ENDIF(" << component_test << ")\n";
+}
- // Choose the final destination. This may be modified for certain
- // target types.
- std::string destination = this->Destination;
+//----------------------------------------------------------------------------
+void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
+ const char* fromDir,
+ const char* config)
+{
+ // Compute the per-configuration directory containing the files.
+ std::string fromDirConfig = fromDir;
+ this->Target->GetMakefile()->GetLocalGenerator()->GetGlobalGenerator()
+ ->AppendDirectoryForConfig("", config, "/", fromDirConfig);
- // Setup special properties for some target types.
- std::string literal_args;
- std::string props;
- const char* properties = 0;
- cmTarget::TargetType type = this->Target->GetType();
- switch(type)
+ std::string config_test;
+ if(config && *config)
{
- case cmTarget::SHARED_LIBRARY:
+ std::string config_upper = cmSystemTools::UpperCase(config);
+ // Skip this configuration for config-specific installation that
+ // does not match it.
+ if(!this->Configurations.empty())
{
- // Add shared library installation properties if this platform
- // supports them.
- const char* lib_version = 0;
- const char* lib_soversion = 0;
-
- // Versioning is supported only for shared libraries and modules,
- // and then only when the platform supports an soname flag.
- cmGlobalGenerator* gg =
- (this->Target->GetMakefile()
- ->GetLocalGenerator()->GetGlobalGenerator());
- if(const char* linkLanguage = this->Target->GetLinkerLanguage(gg))
- {
- std::string sonameFlagVar = "CMAKE_SHARED_LIBRARY_SONAME_";
- sonameFlagVar += linkLanguage;
- sonameFlagVar += "_FLAG";
- if(this->Target->GetMakefile()->GetDefinition(sonameFlagVar.c_str()))
- {
- lib_version = this->Target->GetProperty("VERSION");
- lib_soversion = this->Target->GetProperty("SOVERSION");
- }
- }
-
- if(lib_version)
+ bool found = false;
+ for(std::vector<std::string>::const_iterator i =
+ this->Configurations.begin();
+ !found && i != this->Configurations.end(); ++i)
{
- props += " VERSION ";
- props += lib_version;
+ found = found || (cmSystemTools::UpperCase(*i) == config_upper);
}
- if(lib_soversion)
+ if(!found)
{
- props += " SOVERSION ";
- props += lib_soversion;
+ return;
}
- properties = props.c_str();
}
- break;
- case cmTarget::EXECUTABLE:
+
+ // Begin this configuration block.
+ config_test = "\"${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^(";
+ config_test += config;
+ config_test += ")$\"";
+ os << " IF(" << config_test << ")\n";
+ }
+
+ // Compute the list of files to install for this target.
+ std::vector<std::string> files;
+ std::string literal_args;
+ cmTarget::TargetType type = this->Target->GetType();
+ if(type == cmTarget::EXECUTABLE)
+ {
+ std::string targetName;
+ std::string targetNameReal;
+ std::string targetNameImport;
+ std::string targetNamePDB;
+ this->Target->GetExecutableNames(targetName, targetNameReal,
+ targetNameImport, targetNamePDB,
+ config);
+ if(this->ImportLibrary)
{
- // Add executable installation properties if this platform
- // supports them.
-#if defined(_WIN32) && !defined(__CYGWIN__)
- const char* exe_version = 0;
-#else
- const char* exe_version = this->Target->GetProperty("VERSION");
-#endif
- if(exe_version)
- {
- props += " VERSION ";
- props += exe_version;
- properties = props.c_str();
- }
+ std::string from1 = fromDirConfig;
+ from1 += targetNameImport;
+ files.push_back(from1);
+
+ // An import library looks like a static library.
+ type = cmTarget::STATIC_LIBRARY;
+ }
+ else
+ {
+ std::string from1 = fromDirConfig;
+ from1 += targetName;
// Handle OSX Bundles.
if(this->Target->GetMakefile()->IsOn("APPLE") &&
@@ -136,62 +161,104 @@
{
// Compute the source locations of the bundle executable and
// Info.plist file.
- this->PrepareScriptReference(os, this->Target, "INSTALL",
- false, this->ImportLibrary, false);
- fromFile += ".app";
+ from1 += ".app";
+ files.push_back(from1);
type = cmTarget::INSTALL_DIRECTORY;
literal_args += " USE_SOURCE_PERMISSIONS";
+ // TODO: Still need to apply install_name_tool and stripping
+ // to binaries inside bundle.
+ }
+ else
+ {
+ files.push_back(from1);
+ if(targetNameReal != targetName)
+ {
+ std::string from2 = fromDirConfig;
+ from2 += targetNameReal;
+ files.push_back(from2);
+ }
}
}
- break;
- case cmTarget::STATIC_LIBRARY:
- case cmTarget::MODULE_LIBRARY:
- // Nothing special for modules or static libraries.
- break;
- default:
- break;
}
-
- // An import library looks like a static library.
- if(this->ImportLibrary)
+ else
{
- type = cmTarget::STATIC_LIBRARY;
+ std::string targetName;
+ std::string targetNameSO;
+ std::string targetNameReal;
+ std::string targetNameImport;
+ std::string targetNamePDB;
+ this->Target->GetLibraryNames(targetName, targetNameSO, targetNameReal,
+ targetNameImport, targetNamePDB,
+ config);
+ if(this->ImportLibrary)
+ {
+ std::string from1 = fromDirConfig;
+ from1 += targetNameImport;
+ files.push_back(from1);
+
+ // An import library looks like a static library.
+ type = cmTarget::STATIC_LIBRARY;
+ }
+ else
+ {
+ std::string from1 = fromDirConfig;
+ from1 += targetName;
+ files.push_back(from1);
+ if(targetNameSO != targetName)
+ {
+ std::string from2 = fromDirConfig;
+ from2 += targetNameSO;
+ files.push_back(from2);
+ }
+ if(targetNameReal != targetName &&
+ targetNameReal != targetNameSO)
+ {
+ std::string from3 = fromDirConfig;
+ from3 += targetNameReal;
+ files.push_back(from3);
+ }
+ }
}
// Write code to install the target file.
const char* no_dir_permissions = 0;
const char* no_rename = 0;
- bool optional = this->Optional | this->ImportLibrary;
- this->AddInstallRule(os, destination.c_str(), type, fromFile.c_str(),
- optional, properties,
+ const char* no_properties = 0;
+ const char* no_component = 0;
+ std::vector<std::string> no_configurations;
+ bool optional = this->Optional || this->ImportLibrary;
+ this->AddInstallRule(os, this->Destination.c_str(), type, files,
+ optional, no_properties,
this->FilePermissions.c_str(), no_dir_permissions,
- this->Configurations,
- this->Component.c_str(),
+ no_configurations, no_component,
no_rename, literal_args.c_str());
- // Fix the install_name settings in installed binaries.
- if((type == cmTarget::SHARED_LIBRARY ||
- type == cmTarget::MODULE_LIBRARY ||
- type == cmTarget::EXECUTABLE))
- {
- this->AddInstallNamePatchRule(os, destination.c_str());
- }
-
- std::string quotedFullDestinationFilename = "\"$ENV{DESTDIR}";
- quotedFullDestinationFilename += destination;
- quotedFullDestinationFilename += "/";
- quotedFullDestinationFilename += cmSystemTools::GetFilenameName(fromFile);
- quotedFullDestinationFilename += "\"";
+ std::string toFullPath = "$ENV{DESTDIR}";
+ toFullPath += this->Destination;
+ toFullPath += "/";
+ toFullPath += this->GetInstallFilename(this->Target, config,
+ this->ImportLibrary, false);
- this->AddRanlibRule(os, type, quotedFullDestinationFilename);
+ os << " IF(EXISTS \"" << toFullPath << "\")\n";
+ this->AddInstallNamePatchRule(os, config, toFullPath);
+ this->AddRanlibRule(os, type, toFullPath);
+ this->AddStripRule(os, type, toFullPath);
+ os << " ENDIF(EXISTS \"" << toFullPath << "\")\n";
- this->AddStripRule(os, type, quotedFullDestinationFilename, optional);
+ if(config && *config)
+ {
+ // End this configuration block.
+ os << " ENDIF(" << config_test << ")\n";
+ }
}
-
-std::string cmInstallTargetGenerator::GetInstallFilename(const char* config) const
+//----------------------------------------------------------------------------
+std::string
+cmInstallTargetGenerator::GetInstallFilename(const char* config) const
{
- return cmInstallTargetGenerator::GetInstallFilename(this->Target, config, this->ImportLibrary, false);
+ return
+ cmInstallTargetGenerator::GetInstallFilename(this->Target, config,
+ this->ImportLibrary, false);
}
//----------------------------------------------------------------------------
@@ -254,76 +321,19 @@
//----------------------------------------------------------------------------
void
cmInstallTargetGenerator
-::PrepareScriptReference(std::ostream& os, cmTarget* target,
- const char* place, bool useConfigDir,
- bool implib, bool useSOName)
-{
- // If the target name may vary with the configuration type then
- // store all possible names ahead of time in variables.
- std::string fname;
- for(std::vector<std::string>::const_iterator i =
- this->ConfigurationTypes->begin();
- i != this->ConfigurationTypes->end(); ++i)
- {
- // Initialize the name.
- fname = "";
-
- if(useConfigDir)
- {
- // Start with the configuration's subdirectory.
- target->GetMakefile()->GetLocalGenerator()->GetGlobalGenerator()->
- AppendDirectoryForConfig("", i->c_str(), "/", fname);
- }
-
- fname += this->GetInstallFilename(target, i->c_str(),
- implib, useSOName);
-
- // Set a variable with the target name for this configuration.
- os << "SET(" << target->GetName() << "_" << place
- << (implib? "_IMPNAME_" : "_NAME_") << *i
- << " \"" << fname << "\")\n";
- }
-}
-
-//----------------------------------------------------------------------------
-std::string cmInstallTargetGenerator::GetScriptReference(cmTarget* target,
- const char* place,
- bool implib, bool useSOName)
+::AddInstallNamePatchRule(std::ostream& os, const char* config,
+ std::string const& toFullPath)
{
- if(this->ConfigurationTypes->empty())
- {
- // Reference the target by its one configuration name.
- return this->GetInstallFilename(target, this->ConfigurationName,
- implib, useSOName);
- }
- else
+ if(this->ImportLibrary ||
+ !(this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
+ this->Target->GetType() == cmTarget::MODULE_LIBRARY ||
+ this->Target->GetType() == cmTarget::EXECUTABLE))
{
- // Reference the target using the per-configuration variable.
- std::string ref = "${";
- ref += target->GetName();
- if(implib)
- {
- ref += "_";
- ref += place;
- ref += "_IMPNAME_";
- }
- else
- {
- ref += "_";
- ref += place;
- ref += "_NAME_";
- }
- ref += "${CMAKE_INSTALL_CONFIG_NAME}}";
- return ref;
+ return;
}
-}
-//----------------------------------------------------------------------------
-void cmInstallTargetGenerator
-::AddInstallNamePatchRule(std::ostream& os,
- const char* destination)
-{
- std::string installNameTool =
+ // Fix the install_name settings in installed binaries.
+ std::string installNameTool =
this->Target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_NAME_TOOL");
if(!installNameTool.size())
@@ -335,7 +345,6 @@
// shared libraries linked to this target.
std::map<cmStdString, cmStdString> install_name_remap;
cmTarget::LinkLibraryType linkType = cmTarget::OPTIMIZED;
- const char* config = this->ConfigurationName;
if(config && cmSystemTools::UpperCase(config) == "DEBUG")
{
linkType = cmTarget::DEBUG;
@@ -365,15 +374,13 @@
tgt->GetInstallNameDirForInstallTree(config);
if(for_build != for_install)
{
+ std::string fname =
+ this->GetInstallFilename(tgt, config, false, true);
// Map from the build-tree install_name.
- this->PrepareScriptReference(os, tgt, "REMAP_FROM",
- !for_build.empty(), false, true);
- for_build += this->GetScriptReference(tgt, "REMAP_FROM", false, true);
+ for_build += fname;
// Map to the install-tree install_name.
- this->PrepareScriptReference(os, tgt, "REMAP_TO",
- false, false, true);
- for_install += this->GetScriptReference(tgt, "REMAP_TO", false, true);
+ for_install += fname;
// Store the mapping entry.
install_name_remap[for_build] = for_install;
@@ -384,7 +391,6 @@
}
// Edit the install_name of the target itself if necessary.
- this->PrepareScriptReference(os, this->Target, "REMAPPED", false, this->ImportLibrary, true);
std::string new_id;
if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
{
@@ -396,7 +402,8 @@
{
// Prepare to refer to the install-tree install_name.
new_id = for_install;
- new_id += this->GetScriptReference(this->Target, "REMAPPED", this->ImportLibrary, true);
+ new_id += this->GetInstallFilename(this->Target, config,
+ this->ImportLibrary, true);
}
}
@@ -404,33 +411,27 @@
// install_name value and references.
if(!new_id.empty() || !install_name_remap.empty())
{
- std::string component_test = "NOT CMAKE_INSTALL_COMPONENT OR "
- "\"${CMAKE_INSTALL_COMPONENT}\" MATCHES \"^(";
- component_test += this->Component;
- component_test += ")$\"";
- os << "IF(" << component_test << ")\n";
- os << " EXECUTE_PROCESS(COMMAND \"" << installNameTool;
+ os << " EXECUTE_PROCESS(COMMAND \"" << installNameTool;
os << "\"";
if(!new_id.empty())
{
- os << "\n -id \"" << new_id << "\"";
+ os << "\n -id \"" << new_id << "\"";
}
for(std::map<cmStdString, cmStdString>::const_iterator
i = install_name_remap.begin();
i != install_name_remap.end(); ++i)
{
- os << "\n -change \"" << i->first << "\" \"" << i->second << "\"";
+ os << "\n -change \"" << i->first << "\" \"" << i->second << "\"";
}
- os << "\n \"$ENV{DESTDIR}" << destination << "/"
- << this->GetScriptReference(this->Target, "REMAPPED", this->ImportLibrary, true) << "\")\n";
- os << "ENDIF(" << component_test << ")\n";
+ os << "\n \"" << toFullPath << "\")\n";
}
}
-void cmInstallTargetGenerator::AddStripRule(std::ostream& os,
- cmTarget::TargetType type,
- const std::string& quotedFullDestinationFilename,
- bool optional)
+//----------------------------------------------------------------------------
+void
+cmInstallTargetGenerator::AddStripRule(std::ostream& os,
+ cmTarget::TargetType type,
+ const std::string& toFullPath)
{
// don't strip static libraries, because it removes the only symbol table
@@ -452,23 +453,18 @@
return;
}
- std::string optionalString;
- if (optional)
- {
- optionalString = " AND EXISTS ";
- optionalString += quotedFullDestinationFilename;
- }
-
- os << "IF(CMAKE_INSTALL_DO_STRIP" << optionalString << ")\n";
- os << " EXECUTE_PROCESS(COMMAND \""
+ os << " IF(CMAKE_INSTALL_DO_STRIP)\n";
+ os << " EXECUTE_PROCESS(COMMAND \""
<< this->Target->GetMakefile()->GetDefinition("CMAKE_STRIP")
- << "\" " << quotedFullDestinationFilename << " )\n";
- os << "ENDIF(CMAKE_INSTALL_DO_STRIP" << optionalString << ")\n";
+ << "\" \"" << toFullPath << "\")\n";
+ os << " ENDIF(CMAKE_INSTALL_DO_STRIP)\n";
}
-void cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
- cmTarget::TargetType type,
- const std::string& quotedFullDestinationFilename)
+//----------------------------------------------------------------------------
+void
+cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
+ cmTarget::TargetType type,
+ const std::string& toFullPath)
{
// Static libraries need ranlib on this platform.
if(type != cmTarget::STATIC_LIBRARY)
@@ -483,14 +479,13 @@
return;
}
- std::string ranlib = this->Target->GetMakefile()->GetRequiredDefinition(
- "CMAKE_RANLIB");
- if (!ranlib.size())
+ std::string ranlib =
+ this->Target->GetMakefile()->GetRequiredDefinition("CMAKE_RANLIB");
+ if(ranlib.empty())
{
return;
}
- os << "EXECUTE_PROCESS(COMMAND \"";
- os << ranlib;
- os << "\" " << quotedFullDestinationFilename << " )\n";
+ os << " EXECUTE_PROCESS(COMMAND \""
+ << ranlib << "\" \"" << toFullPath << "\")\n";
}
More information about the Cmake-commits
mailing list