From: Derek Barnett <derekwbarnett@gmail.com>
Date: Wed, 24 Jul 2013 20:24:28 +0000 (-0400)
Subject: Minor version bump - 2.3.0
X-Git-Url: https://git.donarmstrong.com/?p=bamtools.git;a=commitdiff_plain;h=9cfa70bfe9cdf1b6adc06beb88246b45fdd6250a

Minor version bump - 2.3.0
  * stabilized remote file support
  * additional bug fixes & feature requests
  * bamtools-utils & jsoncpp libs now built as static libs by default
(issue #55)
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e81b1a..9b97fa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,8 +31,8 @@ ensure_out_of_source_build( "
 
 # set BamTools version information
 set( BamTools_VERSION_MAJOR 2 )
-set( BamTools_VERSION_MINOR 2 )
-set( BamTools_VERSION_BUILD 3 )
+set( BamTools_VERSION_MINOR 3 )
+set( BamTools_VERSION_BUILD 0 )
 
 # set our library and executable destination dirs
 set( EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin" )
diff --git a/docs/Doxyfile b/docs/Doxyfile
index ff88c61..410ea27 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = BamTools
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.2.3
+PROJECT_NUMBER         = 2.3.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
index a9dd092..7e3d3ca 100644
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@@ -34,7 +34,7 @@ set( BamToolsAPISources
 # create main BamTools API shared library
 add_library( BamTools SHARED ${BamToolsAPISources} )
 set_target_properties( BamTools PROPERTIES
-                       SOVERSION "2.2.3"
+                       SOVERSION "2.3.0"
                        OUTPUT_NAME "bamtools" )
 
 # create main BamTools API static library
@@ -50,11 +50,11 @@ else()
     set( APILibs z )
 endif()
 
-target_link_libraries( BamTools ${APILibs} )
+target_link_libraries( BamTools        ${APILibs} )
 target_link_libraries( BamTools-static ${APILibs} )
 
 # set library install destinations
-install( TARGETS BamTools LIBRARY DESTINATION "lib/bamtools" RUNTIME DESTINATION "bin")
+install( TARGETS BamTools        LIBRARY DESTINATION "lib/bamtools" RUNTIME DESTINATION "bin")
 install( TARGETS BamTools-static ARCHIVE DESTINATION "lib/bamtools")
 
 # export API headers
diff --git a/src/api/internal/bam/BamMultiReader_p.cpp b/src/api/internal/bam/BamMultiReader_p.cpp
index 08d445d..310d837 100644
--- a/src/api/internal/bam/BamMultiReader_p.cpp
+++ b/src/api/internal/bam/BamMultiReader_p.cpp
@@ -2,7 +2,7 @@
 // BamMultiReader_p.cpp (c) 2010 Derek Barnett, Erik Garrison
 // Marth Lab, Department of Biology, Boston College
 // ---------------------------------------------------------------------------
-// Last modified: 14 January 2013 (DB)
+// Last modified: 24 July 2013 (DB)
 // ---------------------------------------------------------------------------
 // Functionality for simultaneously reading multiple BAM files
 // *************************************************************************
@@ -184,7 +184,7 @@ IMultiMerger* BamMultiReaderPrivate::CreateAlignmentCache(void) {
             m_mergeOrder = BamMultiReader::MergeByCoordinate;
 
         // if BAM files are sorted by read name
-        if ( header.SortOrder == Constants::SAM_HD_SORTORDER_QUERYNAME )
+        else if ( header.SortOrder == Constants::SAM_HD_SORTORDER_QUERYNAME )
             m_mergeOrder = BamMultiReader::MergeByName;
 
         // otherwise, sorting is either "unknown" or marked as "unsorted"
diff --git a/src/third_party/jsoncpp/CMakeLists.txt b/src/third_party/jsoncpp/CMakeLists.txt
index 03c091b..8dc64e4 100644
--- a/src/third_party/jsoncpp/CMakeLists.txt
+++ b/src/third_party/jsoncpp/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions( -DBAMTOOLS_JSONCPP_LIBRARY ) # (for proper exporting of library
 add_definitions( -fPIC ) # (attempt to force PIC compiling on CentOS, not being set on shared libs by CMake)
 
 # create jsoncpp library
-add_library( jsoncpp SHARED
+add_library( jsoncpp STATIC
              json_reader.cpp
              json_value.cpp
              json_writer.cpp
@@ -18,6 +18,6 @@ add_library( jsoncpp SHARED
 
 # set jsoncpp library properties
 set_target_properties( jsoncpp PROPERTIES
-                       SOVERSION   1.0.0
                        OUTPUT_NAME jsoncpp
+                       PREFIX "lib"
                      )
diff --git a/src/toolkit/CMakeLists.txt b/src/toolkit/CMakeLists.txt
index 1be9efb..33b0735 100644
--- a/src/toolkit/CMakeLists.txt
+++ b/src/toolkit/CMakeLists.txt
@@ -31,7 +31,7 @@ add_executable( bamtools_cmd
 
 # set BamTools application properties
 set_target_properties( bamtools_cmd PROPERTIES
-                       VERSION  2.2.3
+                       VERSION  2.3.0
                        OUTPUT_NAME "bamtools"
                      )
 # make version info available in application
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index 2d91ca3..1c33f4b 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -13,7 +13,7 @@ add_definitions( -DBAMTOOLS_UTILS_LIBRARY ) # (for proper exporting of library s
 add_definitions( -fPIC ) # (attempt to force PIC compiling on CentOS, not being set on shared libs by CMake)
 
 # create BamTools utils library
-add_library( BamTools-utils SHARED
+add_library( BamTools-utils STATIC
              bamtools_fasta.cpp
              bamtools_options.cpp
              bamtools_pileup_engine.cpp
@@ -25,6 +25,6 @@ target_link_libraries( BamTools-utils BamTools )
 
 # set BamTools library properties
 set_target_properties( BamTools-utils PROPERTIES
-                       SOVERSION   2.2.0
                        OUTPUT_NAME bamtools-utils
+                       PREFIX "lib"
                      )