diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 2a98a1098..25cbe80a8 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1733,9 +1733,8 @@ bool cmFileCommand::HandleInstallCommand(std::vector const& args) std::vector files; int itype = cmTarget::INSTALL_FILES; - std::map properties; bool optional = false; - bool result = this->ParseInstallArgs(args, installer, properties, + bool result = this->ParseInstallArgs(args, installer, itype, rename, destination, files, optional); if (result == true) @@ -1749,7 +1748,6 @@ bool cmFileCommand::HandleInstallCommand(std::vector const& args) //---------------------------------------------------------------------------- bool cmFileCommand::ParseInstallArgs(std::vector const& args, cmFileInstaller& installer, - std::map& properties, int& itype, std::string& rename, std::string& destination, @@ -1757,7 +1755,7 @@ bool cmFileCommand::ParseInstallArgs(std::vector const& args, bool& optional) { std::string stype = "FILES"; - enum Doing { DoingNone, DoingFiles, DoingProperties, + enum Doing { DoingNone, DoingFiles, DoingPermissionsFile, DoingPermissionsDir, DoingPermissionsMatch, DoingSelf24 }; Doing doing = DoingNone; @@ -1850,15 +1848,12 @@ bool cmFileCommand::ParseInstallArgs(std::vector const& args, } else if ( *cstr == "PROPERTIES" ) { - if(current_match_rule) - { - cmOStringStream e; - e << "INSTALL does not allow \"" << *cstr << "\" after REGEX."; - this->SetError(e.str().c_str()); - return false; - } - - doing = DoingProperties; + cmOStringStream e; + e << "INSTALL called with old-style PROPERTIES argument. " + << "This script was generated with an older version of CMake. " + << "Re-run this cmake version on your build tree."; + this->SetError(e.str().c_str()); + return false; } else if ( *cstr == "PERMISSIONS" ) { @@ -1949,11 +1944,6 @@ bool cmFileCommand::ParseInstallArgs(std::vector const& args, doing = DoingFiles; } - else if(doing == DoingProperties && i < args.size()-1) - { - properties[args[i]] = args[i+1].c_str(); - i++; - } else if(doing == DoingFiles) { files.push_back(*cstr); @@ -2027,25 +2017,6 @@ bool cmFileCommand::ParseInstallArgs(std::vector const& args, return false; } - if(properties.find("VERSION") != properties.end()) - { - cmOStringStream e; - e << "INSTALL called with old-style VERSION property. " - << "This script was generated with an older version of CMake. " - << "Re-run this cmake version on your build tree."; - this->SetError(e.str().c_str()); - return false; - } - if(properties.find("SOVERSION") != properties.end()) - { - cmOStringStream e; - e << "INSTALL called with old-style SOVERSION property. " - << "This script was generated with an older version of CMake. " - << "Re-run this cmake version on your build tree."; - this->SetError(e.str().c_str()); - return false; - } - this->GetTargetTypeFromString(stype, itype); this->HandleInstallPermissions(installer, diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h index 925785564..ded7813e6 100644 --- a/Source/cmFileCommand.h +++ b/Source/cmFileCommand.h @@ -183,7 +183,6 @@ protected: bool HandleInstallCommand(std::vector const& args); bool ParseInstallArgs(std::vector const& args, cmFileInstaller& installer, - std::map& properties, int& itype, std::string& destination, std::string& rename, diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index 6f46d297f..ed7a2d82d 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -46,11 +46,10 @@ cmInstallDirectoryGenerator::GenerateScriptActions(std::ostream& os, Indent const& indent) { // Write code to install the directories. - const char* no_properties = 0; const char* no_rename = 0; this->AddInstallRule(os, cmTarget::INSTALL_DIRECTORY, this->Directories, - this->Optional, no_properties, + this->Optional, this->FilePermissions.c_str(), this->DirPermissions.c_str(), no_rename, this->LiteralArguments.c_str(), diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index f4befb39f..617fbb2b3 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -191,7 +191,7 @@ cmInstallExportGenerator::GenerateScriptConfigs(std::ostream& os, files.push_back(i->second); std::string config_test = this->CreateConfigTest(i->first.c_str()); os << indent << "IF(" << config_test << ")\n"; - this->AddInstallRule(os, cmTarget::INSTALL_FILES, files, false, 0, + this->AddInstallRule(os, cmTarget::INSTALL_FILES, files, false, this->FilePermissions.c_str(), 0, 0, 0, indent.Next()); os << indent << "ENDIF(" << config_test << ")\n"; @@ -230,6 +230,6 @@ void cmInstallExportGenerator::GenerateScriptActions(std::ostream& os, // Install the main export file. std::vector files; files.push_back(this->MainImportFile); - this->AddInstallRule(os, cmTarget::INSTALL_FILES, files, false, 0, + this->AddInstallRule(os, cmTarget::INSTALL_FILES, files, false, this->FilePermissions.c_str(), 0, 0, 0, indent); } diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx index 843e31593..176e7d565 100644 --- a/Source/cmInstallFilesGenerator.cxx +++ b/Source/cmInstallFilesGenerator.cxx @@ -45,14 +45,13 @@ void cmInstallFilesGenerator::GenerateScriptActions(std::ostream& os, Indent const& indent) { // Write code to install the files. - const char* no_properties = 0; const char* no_dir_permissions = 0; this->AddInstallRule(os, (this->Programs ? cmTarget::INSTALL_PROGRAMS : cmTarget::INSTALL_FILES), this->Files, - this->Optional, no_properties, + this->Optional, this->FilePermissions.c_str(), no_dir_permissions, this->Rename.c_str(), 0, indent); } diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx index 94a70804f..280c1bc56 100644 --- a/Source/cmInstallGenerator.cxx +++ b/Source/cmInstallGenerator.cxx @@ -43,7 +43,6 @@ void cmInstallGenerator int type, std::vector const& files, bool optional /* = false */, - const char* properties /* = 0 */, const char* permissions_file /* = 0 */, const char* permissions_dir /* = 0 */, const char* rename /* = 0 */, @@ -71,10 +70,6 @@ void cmInstallGenerator { os << " OPTIONAL"; } - if(properties && *properties) - { - os << " PROPERTIES" << properties; - } if(permissions_file && *permissions_file) { os << " PERMISSIONS" << permissions_file; diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h index a6da1198b..60a4b60b8 100644 --- a/Source/cmInstallGenerator.h +++ b/Source/cmInstallGenerator.h @@ -37,7 +37,6 @@ public: std::ostream& os, int type, std::vector const& files, bool optional = false, - const char* properties = 0, const char* permissions_file = 0, const char* permissions_dir = 0, const char* rename = 0, diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index b8df71e95..c4a91039e 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -311,10 +311,9 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os, // Write code to install the target file. const char* no_dir_permissions = 0; const char* no_rename = 0; - const char* no_properties = 0; bool optional = this->Optional || this->ImportLibrary; this->AddInstallRule(os, type, files, - optional, no_properties, + optional, this->FilePermissions.c_str(), no_dir_permissions, no_rename, literal_args.c_str(), indent);