[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-14-gc29302b
Brad King
brad.king at kitware.com
Wed Feb 3 16:14:01 EST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via c29302b3f3ff6ca0822afe0a19c66bad12542ac9 (commit)
via 8e0dd2f2b1a9fb315475914d1716c34acf4ce9db (commit)
from 72a585d3534616b0cf4b241d3b6eeb50f44da79a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c29302b3f3ff6ca0822afe0a19c66bad12542ac9
commit c29302b3f3ff6ca0822afe0a19c66bad12542ac9
Merge: 72a585d 8e0dd2f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 3 16:13:59 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 3 16:13:59 2016 -0500
Merge topic 'install-EXCLUDE_FROM_ALL' into next
8e0dd2f2 Revert topic 'install-EXCLUDE_FROM_ALL'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e0dd2f2b1a9fb315475914d1716c34acf4ce9db
commit 8e0dd2f2b1a9fb315475914d1716c34acf4ce9db
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 3 16:13:26 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 3 16:13:34 2016 -0500
Revert topic 'install-EXCLUDE_FROM_ALL'
The test infrastructure needs more work to pass everywhere.
diff --git a/Help/command/install.rst b/Help/command/install.rst
index e0e18f2..5d2add7 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -45,9 +45,9 @@ signatures that specify them. The common options are:
is associated, such as "runtime" or "development". During
component-specific installation only install rules associated with
the given component name will be executed. During a full installation
- all components are installed unless marked with EXCLUDE_FROM_ALL.
- If ``COMPONENT`` is not provided a default component "Unspecified" is
- created. The default component name may be controlled with the
+ all components are installed. If ``COMPONENT`` is not provided a
+ default component "Unspecified" is created. The default component
+ name may be controlled with the
:variable:`CMAKE_INSTALL_DEFAULT_COMPONENT_NAME` variable.
``RENAME``
@@ -76,8 +76,7 @@ Installing Targets
[PERMISSIONS permissions...]
[CONFIGURATIONS [Debug|Release|...]]
[COMPONENT <component>]
- [OPTIONAL] [EXCLUDE_FROM_ALL]
- [NAMELINK_ONLY|NAMELINK_SKIP]
+ [OPTIONAL] [NAMELINK_ONLY|NAMELINK_SKIP]
] [...])
The ``TARGETS`` form specifies rules for installing targets from a
diff --git a/Help/release/dev/install-EXCLUDE_FROM_ALL.rst b/Help/release/dev/install-EXCLUDE_FROM_ALL.rst
deleted file mode 100644
index a611eae..0000000
--- a/Help/release/dev/install-EXCLUDE_FROM_ALL.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-install-EXCLUDE_FROM_ALL
-------------------------
-
-* The :command:`install` command learned a new ``EXCLUDE_FROM_ALL`` option
- to leave installation rules out of the default installation.
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index aa92d74..15a83ee 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -33,7 +33,6 @@ static cmInstallTargetGenerator* CreateInstallTargetGenerator(cmTarget& target,
impLib, args.GetPermissions().c_str(),
args.GetConfigurations(), args.GetComponent().c_str(),
message,
- args.GetExcludeFromAll(),
args.GetOptional() || forceOpt);
}
@@ -49,8 +48,7 @@ static cmInstallFilesGenerator* CreateInstallFilesGenerator(
programs, args.GetPermissions().c_str(),
args.GetConfigurations(), args.GetComponent().c_str(),
message,
- args.GetExcludeFromAll(), args.GetRename().c_str(),
- args.GetOptional());
+ args.GetRename().c_str(), args.GetOptional());
}
@@ -119,7 +117,6 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
int componentCount = 0;
bool doing_script = false;
bool doing_code = false;
- bool exclude_from_all = false;
// Scan the args once for COMPONENT. Only allow one.
//
@@ -131,10 +128,6 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
++i;
component = args[i];
}
- if(args[i] == "EXCLUDE_FROM_ALL")
- {
- exclude_from_all = true;
- }
}
if(componentCount>1)
@@ -182,7 +175,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
}
this->Makefile->AddInstallGenerator(
new cmInstallScriptGenerator(script.c_str(), false,
- component.c_str(), exclude_from_all));
+ component.c_str()));
}
else if(doing_code)
{
@@ -190,7 +183,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
std::string code = args[i];
this->Makefile->AddInstallGenerator(
new cmInstallScriptGenerator(code.c_str(), true,
- component.c_str(), exclude_from_all));
+ component.c_str()));
}
}
@@ -956,7 +949,6 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
Doing doing = DoingDirs;
bool in_match_mode = false;
bool optional = false;
- bool exclude_from_all = false;
bool message_never = false;
std::vector<std::string> dirs;
const char* destination = 0;
@@ -1138,19 +1130,6 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
// Switch to setting the component property.
doing = DoingComponent;
}
- else if(args[i] == "EXCLUDE_FROM_ALL")
- {
- if(in_match_mode)
- {
- std::ostringstream e;
- e << args[0] << " does not allow \""
- << args[i] << "\" after PATTERN or REGEX.";
- this->SetError(e.str().c_str());
- return false;
- }
- exclude_from_all = true;
- doing = DoingNone;
- }
else if(doing == DoingDirs)
{
// Convert this directory to a full path.
@@ -1294,7 +1273,6 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
configurations,
component.c_str(),
message,
- exclude_from_all,
literal_args.c_str(),
optional));
@@ -1423,8 +1401,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
exportSet,
ica.GetDestination().c_str(),
ica.GetPermissions().c_str(), ica.GetConfigurations(),
- ica.GetComponent().c_str(), message,
- ica.GetExcludeFromAll(), fname.c_str(),
+ ica.GetComponent().c_str(), message, fname.c_str(),
name_space.GetCString(), exportOld.IsEnabled());
this->Makefile->AddInstallGenerator(exportGenerator);
diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx
index 6ded365..236ca1f 100644
--- a/Source/cmInstallCommandArguments.cxx
+++ b/Source/cmInstallCommandArguments.cxx
@@ -27,15 +27,14 @@ cmInstallCommandArguments::cmInstallCommandArguments(
const std::string& defaultComponent)
:Parser()
,ArgumentGroup()
-,Destination (&Parser, "DESTINATION" , &ArgumentGroup)
-,Component (&Parser, "COMPONENT" , &ArgumentGroup)
-,ExcludeFromAll(&Parser, "EXCLUDE_FROM_ALL", &ArgumentGroup)
-,Rename (&Parser, "RENAME" , &ArgumentGroup)
-,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup)
-,Configurations(&Parser, "CONFIGURATIONS" , &ArgumentGroup)
-,Optional (&Parser, "OPTIONAL" , &ArgumentGroup)
-,NamelinkOnly (&Parser, "NAMELINK_ONLY" , &ArgumentGroup)
-,NamelinkSkip (&Parser, "NAMELINK_SKIP" , &ArgumentGroup)
+,Destination (&Parser, "DESTINATION" , &ArgumentGroup)
+,Component (&Parser, "COMPONENT" , &ArgumentGroup)
+,Rename (&Parser, "RENAME" , &ArgumentGroup)
+,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup)
+,Configurations(&Parser, "CONFIGURATIONS", &ArgumentGroup)
+,Optional (&Parser, "OPTIONAL" , &ArgumentGroup)
+,NamelinkOnly (&Parser, "NAMELINK_ONLY" , &ArgumentGroup)
+,NamelinkSkip (&Parser, "NAMELINK_SKIP" , &ArgumentGroup)
,GenericArguments(0)
,DefaultComponentName(defaultComponent)
{
@@ -111,19 +110,6 @@ bool cmInstallCommandArguments::GetOptional() const
return false;
}
-bool cmInstallCommandArguments::GetExcludeFromAll() const
-{
- if (this->ExcludeFromAll.IsEnabled())
- {
- return true;
- }
- if (this->GenericArguments!=0)
- {
- return this->GenericArguments->GetExcludeFromAll();
- }
- return false;
-}
-
bool cmInstallCommandArguments::GetNamelinkOnly() const
{
if (this->NamelinkOnly.IsEnabled())
diff --git a/Source/cmInstallCommandArguments.h b/Source/cmInstallCommandArguments.h
index 694f1ed..90347e6 100644
--- a/Source/cmInstallCommandArguments.h
+++ b/Source/cmInstallCommandArguments.h
@@ -30,7 +30,6 @@ class cmInstallCommandArguments
const std::string& GetDestination() const;
const std::string& GetComponent() const;
- bool GetExcludeFromAll() const;
const std::string& GetRename() const;
const std::string& GetPermissions() const;
const std::vector<std::string>& GetConfigurations() const;
@@ -49,7 +48,6 @@ class cmInstallCommandArguments
cmInstallCommandArguments(); // disabled
cmCAString Destination;
cmCAString Component;
- cmCAEnabler ExcludeFromAll;
cmCAString Rename;
cmCAStringVector Permissions;
cmCAStringVector Configurations;
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index 6ad6c75..f2e8609 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -23,11 +23,9 @@ cmInstallDirectoryGenerator
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message,
- bool exclude_from_all,
const char* literal_args,
bool optional):
- cmInstallGenerator(dest, configurations, component, message,
- exclude_from_all),
+ cmInstallGenerator(dest, configurations, component, message),
LocalGenerator(0),
Directories(dirs),
FilePermissions(file_permissions), DirPermissions(dir_permissions),
diff --git a/Source/cmInstallDirectoryGenerator.h b/Source/cmInstallDirectoryGenerator.h
index b137f44..9b732d3 100644
--- a/Source/cmInstallDirectoryGenerator.h
+++ b/Source/cmInstallDirectoryGenerator.h
@@ -27,7 +27,6 @@ public:
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message,
- bool exclude_from_all,
const char* literal_args,
bool optional = false);
virtual ~cmInstallDirectoryGenerator();
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 80fc054..9570ba3 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -33,11 +33,9 @@ cmInstallExportGenerator::cmInstallExportGenerator(
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message,
- bool exclude_from_all,
const char* filename, const char* name_space,
bool exportOld)
- :cmInstallGenerator(destination, configurations, component, message,
- exclude_from_all)
+ :cmInstallGenerator(destination, configurations, component, message)
,ExportSet(exportSet)
,FilePermissions(file_permissions)
,FileName(filename)
diff --git a/Source/cmInstallExportGenerator.h b/Source/cmInstallExportGenerator.h
index 1b1c046..885ed05 100644
--- a/Source/cmInstallExportGenerator.h
+++ b/Source/cmInstallExportGenerator.h
@@ -31,7 +31,6 @@ public:
const std::vector<std::string>& configurations,
const char* component,
MessageLevel message,
- bool exclude_from_all,
const char* filename, const char* name_space,
bool exportOld);
~cmInstallExportGenerator();
diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx
index d3d258e..68557bd 100644
--- a/Source/cmInstallFilesCommand.cxx
+++ b/Source/cmInstallFilesCommand.cxx
@@ -122,7 +122,6 @@ void cmInstallFilesCommand::CreateInstallGenerator() const
// Use a file install generator.
const char* no_permissions = "";
const char* no_rename = "";
- bool no_exclude_from_all = false;
std::string no_component = this->Makefile->GetSafeDefinition(
"CMAKE_INSTALL_DEFAULT_COMPONENT_NAME");
std::vector<std::string> no_configurations;
@@ -132,8 +131,7 @@ void cmInstallFilesCommand::CreateInstallGenerator() const
new cmInstallFilesGenerator(this->Files,
destination.c_str(), false,
no_permissions, no_configurations,
- no_component.c_str(), message,
- no_exclude_from_all, no_rename));
+ no_component.c_str(), message, no_rename));
}
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index 3dd5528..383031b 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -24,11 +24,9 @@ cmInstallFilesGenerator
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message,
- bool exclude_from_all,
const char* rename,
bool optional):
- cmInstallGenerator(dest, configurations, component, message,
- exclude_from_all),
+ cmInstallGenerator(dest, configurations, component, message),
LocalGenerator(0),
Files(files),
FilePermissions(file_permissions),
diff --git a/Source/cmInstallFilesGenerator.h b/Source/cmInstallFilesGenerator.h
index efaf62b..bfe4039 100644
--- a/Source/cmInstallFilesGenerator.h
+++ b/Source/cmInstallFilesGenerator.h
@@ -26,7 +26,6 @@ public:
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message,
- bool exclude_from_all,
const char* rename,
bool optional = false);
virtual ~cmInstallFilesGenerator();
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index 660e44f..2e1c5f0 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -19,13 +19,11 @@ cmInstallGenerator
::cmInstallGenerator(const char* destination,
std::vector<std::string> const& configurations,
const char* component,
- MessageLevel message,
- bool exclude_from_all):
+ MessageLevel message):
cmScriptGenerator("CMAKE_INSTALL_CONFIG_NAME", configurations),
Destination(destination? destination:""),
Component(component? component:""),
- Message(message),
- ExcludeFromAll(exclude_from_all)
+ Message(message)
{
}
@@ -148,16 +146,12 @@ void cmInstallGenerator
//----------------------------------------------------------------------------
std::string
-cmInstallGenerator::CreateComponentTest(const char* component,
- bool exclude_from_all)
+cmInstallGenerator::CreateComponentTest(const char* component)
{
- std::string result = "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \"";
+ std::string result = "NOT CMAKE_INSTALL_COMPONENT OR "
+ "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \"";
result += component;
result += "\"";
- if(!exclude_from_all)
- {
- result += " OR NOT CMAKE_INSTALL_COMPONENT";
- }
return result;
}
@@ -169,7 +163,7 @@ void cmInstallGenerator::GenerateScript(std::ostream& os)
// Begin this block of installation.
std::string component_test =
- this->CreateComponentTest(this->Component.c_str(),this->ExcludeFromAll);
+ this->CreateComponentTest(this->Component.c_str());
os << indent << "if(" << component_test << ")\n";
// Generate the script possibly with per-configuration code.
diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h
index db89590..b8e5b53 100644
--- a/Source/cmInstallGenerator.h
+++ b/Source/cmInstallGenerator.h
@@ -36,8 +36,7 @@ public:
cmInstallGenerator(const char* destination,
std::vector<std::string> const& configurations,
const char* component,
- MessageLevel message,
- bool exclude_from_all);
+ MessageLevel message);
virtual ~cmInstallGenerator();
void AddInstallRule(
@@ -68,14 +67,12 @@ public:
protected:
virtual void GenerateScript(std::ostream& os);
- std::string CreateComponentTest(const char* component,
- bool exclude_from_all);
+ std::string CreateComponentTest(const char* component);
// Information shared by most generator types.
std::string Destination;
std::string Component;
MessageLevel Message;
- bool ExcludeFromAll;
};
#endif
diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx
index b6d0c45..e6fbe88 100644
--- a/Source/cmInstallProgramsCommand.cxx
+++ b/Source/cmInstallProgramsCommand.cxx
@@ -85,7 +85,6 @@ void cmInstallProgramsCommand::FinalPass()
// Use a file install generator.
const char* no_permissions = "";
const char* no_rename = "";
- bool no_exclude_from_all = false;
std::string no_component = this->Makefile->GetSafeDefinition(
"CMAKE_INSTALL_DEFAULT_COMPONENT_NAME");
std::vector<std::string> no_configurations;
@@ -95,8 +94,7 @@ void cmInstallProgramsCommand::FinalPass()
new cmInstallFilesGenerator(this->Files,
destination.c_str(), true,
no_permissions, no_configurations,
- no_component.c_str(), message,
- no_exclude_from_all, no_rename));
+ no_component.c_str(), message, no_rename));
}
/**
diff --git a/Source/cmInstallScriptGenerator.cxx b/Source/cmInstallScriptGenerator.cxx
index d58d039..933aa07 100644
--- a/Source/cmInstallScriptGenerator.cxx
+++ b/Source/cmInstallScriptGenerator.cxx
@@ -14,9 +14,8 @@
//----------------------------------------------------------------------------
cmInstallScriptGenerator
::cmInstallScriptGenerator(const char* script, bool code,
- const char* component, bool exclude_from_all) :
- cmInstallGenerator(0, std::vector<std::string>(), component, MessageDefault,
- exclude_from_all),
+ const char* component) :
+ cmInstallGenerator(0, std::vector<std::string>(), component, MessageDefault),
Script(script), Code(code)
{
}
@@ -32,7 +31,7 @@ void cmInstallScriptGenerator::GenerateScript(std::ostream& os)
{
Indent indent;
std::string component_test =
- this->CreateComponentTest(this->Component.c_str(), this->ExcludeFromAll);
+ this->CreateComponentTest(this->Component.c_str());
os << indent << "if(" << component_test << ")\n";
if(this->Code)
diff --git a/Source/cmInstallScriptGenerator.h b/Source/cmInstallScriptGenerator.h
index 7e7c0c8..54a7b21 100644
--- a/Source/cmInstallScriptGenerator.h
+++ b/Source/cmInstallScriptGenerator.h
@@ -21,7 +21,7 @@ class cmInstallScriptGenerator: public cmInstallGenerator
{
public:
cmInstallScriptGenerator(const char* script, bool code,
- const char* component, bool exclude_from_all);
+ const char* component);
virtual ~cmInstallScriptGenerator();
protected:
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 3d44fe2..5e88fa2 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -30,10 +30,8 @@ cmInstallTargetGenerator
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message,
- bool exclude_from_all,
bool optional):
- cmInstallGenerator(dest, configurations, component, message,
- exclude_from_all),
+ cmInstallGenerator(dest, configurations, component, message),
TargetName(targetName),
Target(0),
FilePermissions(file_permissions),
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index 46b4532..18b3130 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -28,7 +28,6 @@ public:
std::vector<std::string> const& configurations,
const char* component,
MessageLevel message,
- bool exclude_from_all,
bool optional
);
virtual ~cmInstallTargetGenerator();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6b73987..1d17032 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2557,7 +2557,7 @@ public:
cmInstallTargetGenerator(
t, dest, implib, "", std::vector<std::string>(), "Unspecified",
cmInstallGenerator::SelectMessageLevel(lg->GetMakefile()),
- false, false)
+ false)
{
this->Compute(lg);
}
@@ -2584,7 +2584,7 @@ cmLocalGenerator
// Include the user-specified pre-install script for this target.
if(const char* preinstall = (*l)->GetProperty("PRE_INSTALL_SCRIPT"))
{
- cmInstallScriptGenerator g(preinstall, false, 0, false);
+ cmInstallScriptGenerator g(preinstall, false, 0);
g.Generate(os, config, configurationTypes);
}
@@ -2645,7 +2645,7 @@ cmLocalGenerator
// Include the user-specified post-install script for this target.
if(const char* postinstall = (*l)->GetProperty("POST_INSTALL_SCRIPT"))
{
- cmInstallScriptGenerator g(postinstall, false, 0, false);
+ cmInstallScriptGenerator g(postinstall, false, 0);
g.Generate(os, config, configurationTypes);
}
}
diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt
deleted file mode 100644
index 517cee2..0000000
--- a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt
+++ /dev/null
@@ -1,3 +0,0 @@
--- Install configuration: "[^"]*"
--- Installing: [^
-]*/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-build/root/src-all/main\.c$
diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake
deleted file mode 100644
index 00db5d0..0000000
--- a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-install(FILES main.c DESTINATION src-all)
-install(FILES main.c DESTINATION src-exc EXCLUDE_FROM_ALL)
diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt
deleted file mode 100644
index 17672f2..0000000
--- a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt
+++ /dev/null
@@ -1,3 +0,0 @@
--- Install configuration: "[^"]*"
--- Installing: [^
-]*/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-build/root/bin/myexe(\.exe)?$
diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake
deleted file mode 100644
index 16e8a90..0000000
--- a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-enable_language(C)
-add_executable(myexe main.c)
-add_executable(mytest main.c)
-install(TARGETS myexe DESTINATION bin)
-install(TARGETS mytest DESTINATION bin EXCLUDE_FROM_ALL)
diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake
index c57e5ec..2c1b29d 100644
--- a/Tests/RunCMake/install/RunCMakeTest.cmake
+++ b/Tests/RunCMake/install/RunCMakeTest.cmake
@@ -13,15 +13,3 @@ run_cmake(TARGETS-DESTINATION-bad)
run_cmake(CMP0062-OLD)
run_cmake(CMP0062-NEW)
run_cmake(CMP0062-WARN)
-
-function(run_install_test case)
- set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build)
- set(RunCMake_TEST_NO_CLEAN 1)
- set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/root")
- file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
- file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
- run_cmake(${case})
- run_cmake_command(${case}-install ${CMAKE_COMMAND} --build . --target install)
-endfunction()
-run_install_test(EXCLUDE_FROM_ALL-FILES)
-run_install_test(EXCLUDE_FROM_ALL-TARGETS)
diff --git a/Tests/RunCMake/install/main.c b/Tests/RunCMake/install/main.c
deleted file mode 100644
index 78f2de1..0000000
--- a/Tests/RunCMake/install/main.c
+++ /dev/null
@@ -1 +0,0 @@
-int main(void) { return 0; }
-----------------------------------------------------------------------
Summary of changes:
Help/command/install.rst | 9 +++---
Help/release/dev/install-EXCLUDE_FROM_ALL.rst | 5 ----
Source/cmInstallCommand.cxx | 31 +++-----------------
Source/cmInstallCommandArguments.cxx | 30 +++++--------------
Source/cmInstallCommandArguments.h | 2 --
Source/cmInstallDirectoryGenerator.cxx | 4 +--
Source/cmInstallDirectoryGenerator.h | 1 -
Source/cmInstallExportGenerator.cxx | 4 +--
Source/cmInstallExportGenerator.h | 1 -
Source/cmInstallFilesCommand.cxx | 4 +--
Source/cmInstallFilesGenerator.cxx | 4 +--
Source/cmInstallFilesGenerator.h | 1 -
Source/cmInstallGenerator.cxx | 18 ++++--------
Source/cmInstallGenerator.h | 7 ++---
Source/cmInstallProgramsCommand.cxx | 4 +--
Source/cmInstallScriptGenerator.cxx | 7 ++---
Source/cmInstallScriptGenerator.h | 2 +-
Source/cmInstallTargetGenerator.cxx | 4 +--
Source/cmInstallTargetGenerator.h | 1 -
Source/cmLocalGenerator.cxx | 6 ++--
.../EXCLUDE_FROM_ALL-FILES-install-stdout.txt | 3 --
.../RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake | 2 --
.../EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt | 3 --
.../install/EXCLUDE_FROM_ALL-TARGETS.cmake | 5 ----
Tests/RunCMake/install/RunCMakeTest.cmake | 12 --------
Tests/RunCMake/install/main.c | 1 -
26 files changed, 37 insertions(+), 134 deletions(-)
delete mode 100644 Help/release/dev/install-EXCLUDE_FROM_ALL.rst
delete mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt
delete mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake
delete mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt
delete mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake
delete mode 100644 Tests/RunCMake/install/main.c
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list