From: Derek Barnett Date: Wed, 4 Apr 2012 18:47:01 +0000 (-0700) Subject: Merge pull request #41 from tobiasmarschall/master X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bf86ea8b7772ee3e4c5b411134fa883ab5dbf7bd;hp=-c;p=bamtools.git Merge pull request #41 from tobiasmarschall/master Include header sys/filio.h when compiling on SunOS. --- bf86ea8b7772ee3e4c5b411134fa883ab5dbf7bd diff --combined CMakeLists.txt index 96d3467,f5b9403..b89990e --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -32,7 -32,7 +32,7 @@@ ensure_out_of_source_build( # set BamTools version information set( BamTools_VERSION_MAJOR 2 ) set( BamTools_VERSION_MINOR 1 ) -set( BamTools_VERSION_BUILD 0 ) +set( BamTools_VERSION_BUILD 1 ) # set our library and executable destination dirs set( EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin" ) @@@ -41,6 -41,9 +41,9 @@@ set( LIBRARY_OUTPUT_PATH "${CMAKE_SO # define compiler flags for all code set( CMAKE_BUILD_TYPE Release ) add_definitions( -Wall -D_FILE_OFFSET_BITS=64 ) + if( "${CMAKE_SYSTEM_NAME}" MATCHES "SunOS" ) + add_definitions( -DSUN_OS ) + endif() # add our includes root path include_directories( src )