diff options
| author | Alex Turbov <i.zaufi@gmail.com> | 2017-07-31 14:53:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-20 17:33:22 (GMT) |
| commit | 091663395e25a9671024b8f5a8be9995b7b80604 (patch) | |
| tree | f096b347a7c8807a9060fabd873e3b91fee3f1b8 /Source/CPack/cpack.cxx | |
| parent | 4547d9a83030f8ae7e636cef16a261c65e6feb40 (diff) | |
| download | CMake-091663395e25a9671024b8f5a8be9995b7b80604.zip CMake-091663395e25a9671024b8f5a8be9995b7b80604.tar.gz CMake-091663395e25a9671024b8f5a8be9995b7b80604.tar.bz2 | |
CPack: Add missing check for CPACK_INSTALL_SCRIPT variable
Also add a test case that uses CPACK_INSTALL_SCRIPT.
Co-Author: Domen Vrankar <domen.vrankar@gmail.com>
Fixes: #15005
Diffstat (limited to 'Source/CPack/cpack.cxx')
| -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; |