summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-08-30 14:40:56 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-08-30 14:40:59 (GMT)
commit80bc73f1b823c7daf6eb5114792b2819a0d92c39 (patch)
tree200f6e03891f00d262fb9d720e6d876c33f654e4
parentf4aa346538433f4c89a9963d74ea5d3f9bd60390 (diff)
parent72a1af29c247cc9dffd86d8449d56a39af3fd6c5 (diff)
downloadCMake-80bc73f1b823c7daf6eb5114792b2819a0d92c39.zip
CMake-80bc73f1b823c7daf6eb5114792b2819a0d92c39.tar.gz
CMake-80bc73f1b823c7daf6eb5114792b2819a0d92c39.tar.bz2
Merge topic 'install-CMP0054'
72a1af29 install: Avoid CMP0054 warning in generated install script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1204
-rw-r--r--Source/cmInstallGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index 13b588e..3fbb3af 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -131,9 +131,9 @@ void cmInstallGenerator::AddInstallRule(
std::string cmInstallGenerator::CreateComponentTest(const char* component,
bool exclude_from_all)
{
- std::string result = "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \"";
+ std::string result = "\"x${CMAKE_INSTALL_COMPONENT}x\" STREQUAL \"x";
result += component;
- result += "\"";
+ result += "x\"";
if (!exclude_from_all) {
result += " OR NOT CMAKE_INSTALL_COMPONENT";
}