Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
pezmaster31 committed Jul 24, 2013
1 parent 153d8f4 commit 9cfa70b
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -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" )
Expand Down
2 changes: 1 addition & 1 deletion docs/Doxyfile
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/api/CMakeLists.txt
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/api/internal/bam/BamMultiReader_p.cpp
Expand Up @@ -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
// *************************************************************************
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/third_party/jsoncpp/CMakeLists.txt
Expand Up @@ -10,14 +10,14 @@ 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
)

# set jsoncpp library properties
set_target_properties( jsoncpp PROPERTIES
SOVERSION 1.0.0
OUTPUT_NAME jsoncpp
PREFIX "lib"
)
2 changes: 1 addition & 1 deletion src/toolkit/CMakeLists.txt
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/utils/CMakeLists.txt
Expand Up @@ -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
Expand All @@ -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"
)

0 comments on commit 9cfa70b

Please sign in to comment.