diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-15 19:34:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-01-15 19:34:20 (GMT) |
| commit | d870867570f84702f789100a43762e4536721b1a (patch) | |
| tree | a3de87ee6ba63045fd943c5d19469255561b0140 | |
| parent | 3a40a8adf36c25321895c0ba12484d1e2989be6b (diff) | |
| parent | 8ff1d4714fb7cd42eb3cd8db041b529e433eb7c8 (diff) | |
| download | CMake-d870867570f84702f789100a43762e4536721b1a.zip CMake-d870867570f84702f789100a43762e4536721b1a.tar.gz CMake-d870867570f84702f789100a43762e4536721b1a.tar.bz2 | |
Merge topic 'fix-empty-link-line-crash'
8ff1d47 CMake: Skip empty link.txt lines (#13845)
| -rw-r--r-- | Source/cmake.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index a44c825..0acd2fc 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -3299,6 +3299,12 @@ int cmake::ExecuteLinkScript(std::vector<std::string>& args) int result = 0; while(result == 0 && cmSystemTools::GetLineFromStream(fin, command)) { + // Skip empty command lines. + if(command.find_first_not_of(" \t") == command.npos) + { + continue; + } + // Setup this command line. const char* cmd[2] = {command.c_str(), 0}; cmsysProcess_SetCommand(cp, cmd); |