diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-21 12:19:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-21 12:19:11 (GMT) |
| commit | 5c5b28dd9ddd47db89a09905542597f88d200d67 (patch) | |
| tree | c5a2db8dbc95efac843102aef0fedd6d0c2666ac /Source/CPack | |
| parent | 2c0da01c4573bd4f91e78a4f95e0493be9c943ce (diff) | |
| parent | 091663395e25a9671024b8f5a8be9995b7b80604 (diff) | |
| download | CMake-5c5b28dd9ddd47db89a09905542597f88d200d67.zip CMake-5c5b28dd9ddd47db89a09905542597f88d200d67.tar.gz CMake-5c5b28dd9ddd47db89a09905542597f88d200d67.tar.bz2 | |
Merge topic 'cpack-check-install-script'
09166339 CPack: Add missing check for CPACK_INSTALL_SCRIPT variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1090
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cpack.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 33d03e5..cc51c60 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -350,13 +350,14 @@ int main(int argc, char const* const* argv) } if (!mf->GetDefinition("CPACK_INSTALL_COMMANDS") && + !mf->GetDefinition("CPACK_INSTALL_SCRIPT") && !mf->GetDefinition("CPACK_INSTALLED_DIRECTORIES") && !mf->GetDefinition("CPACK_INSTALL_CMAKE_PROJECTS")) { cmCPack_Log( &log, cmCPackLog::LOG_ERROR, "Please specify build tree of the project that uses CMake " "using CPACK_INSTALL_CMAKE_PROJECTS, specify " - "CPACK_INSTALL_COMMANDS, or specify " + "CPACK_INSTALL_COMMANDS, CPACK_INSTALL_SCRIPT, or " "CPACK_INSTALLED_DIRECTORIES." << std::endl); parsed = 0; |