# 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" )
# 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.
# 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
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
// 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
// *************************************************************************
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"
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"
)
# 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
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
# set BamTools library properties
set_target_properties( BamTools-utils PROPERTIES
- SOVERSION 2.2.0
OUTPUT_NAME bamtools-utils
+ PREFIX "lib"
)