Update version number and the cmake file for change log

Illumina · Oct 6, 2017 · c96587d · c96587d
1 parent 8ee90dd
commit c96587d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unreleased
+## v1.2.1 - 2017-10-06
 ### Added
 - Use the BAM mate CIGAR (MC) tag, when present, to improve the accuracy of accessing if a read has extended into adapter sequence (MANTA-1097)
 - Add sanity check of specified target regions during configuration (MANTA-1218)

diff --git a/src/c++/lib/manta/test/testUtil.hh b/src/c++/lib/manta/test/testUtil.hh
@@ -41,7 +41,9 @@
 /// Wrap string for handling input streams
 class line : public std::string {};
 
-std::istream &operator>>(std::istream &is, line &l)
+inline
+std::istream&
+operator>>(std::istream &is, line &l)
 {
     std::getline(is, l);
     return is;

diff --git a/src/cmake/preInstall/copyrightAndChanges/CMakeLists.txt b/src/cmake/preInstall/copyrightAndChanges/CMakeLists.txt
@@ -24,6 +24,6 @@
 #
 
 # Installing top level components
-foreach(topfile ChangeLog.txt COPYRIGHT.txt LICENSE.txt)
+foreach(topfile CHANGELOG.md COPYRIGHT.txt LICENSE.txt)
     install(FILES "${CMAKE_SOURCE_DIR}/${topfile}" DESTINATION "${THIS_DATADIR}")
 endforeach()