diff options
author | Brad King <brad.king@kitware.com> | 2020-03-18 13:07:17 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-18 13:07:24 (GMT) |
commit | 2d3eeffc5df3b24c4159d9a27fb4104b9e0e6fec (patch) | |
tree | 59358ef9378bf5ca489f0d0e8bd470de5e402586 | |
parent | 0d8e2f7ba9b6c8e796e9d9ffd44bb7d817530588 (diff) | |
parent | 2ec6fbcb9b267faeba7ceeed6e220fd05a729288 (diff) | |
download | CMake-2d3eeffc5df3b24c4159d9a27fb4104b9e0e6fec.zip CMake-2d3eeffc5df3b24c4159d9a27fb4104b9e0e6fec.tar.gz CMake-2d3eeffc5df3b24c4159d9a27fb4104b9e0e6fec.tar.bz2 |
Merge topic 'bootstrap-version-crlf'
2ec6fbcb9b bootstrap: Tolerate trailing content in CMakeVersion.cmake components
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4491
-rwxr-xr-x | bootstrap | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -17,7 +17,7 @@ cmake_extract_standard_flags() cmake_version_component() { sed -n " -/^set(CMake_VERSION_${1}/ {s/set(CMake_VERSION_${1} *\([0-9]*\))/\1/;p;} +/^set(CMake_VERSION_${1}/ {s/set(CMake_VERSION_${1} *\([0-9]*\)).*/\1/;p;} " "${cmake_source_dir}/Source/CMakeVersion.cmake" } |