diff --git a/CMakeLists.txt b/CMakeLists.txt index fd246ae..c008abe 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ include(cxx) include(configureFiles) include(FindZLIB) -include(GetBoost) include(GetHtslib) include(GetGoogleTest) include(GetGraphTools) @@ -49,9 +48,18 @@ add_custom_command(TARGET copy_data find_package (Threads REQUIRED) +set(Boost_USE_STATIC_LIBS ON) # only find static libs +set(Boost_USE_MULTITHREADED ON) +set(Boost_USE_STATIC_RUNTIME ON) +find_package(Boost 1.5 COMPONENTS iostreams program_options filesystem system REQUIRED) + include_directories(${ZLIB_INCLUDE_DIR}) include_directories(${BZIP2_INCLUDE_DIR}) +# boost sometimes generates warnings; we won't patch them so let's disable them using SYSTEM +include_directories(SYSTEM ${Boost_INCLUDE_DIR}) +link_directories(${Boost_LIBRARY_DIRS}) + # make libraries first add_subdirectory (src/c++/lib) add_subdirectory (external) diff --git a/Dockerfile b/Dockerfile index 03285c6..7f324b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM ubuntu:16.04 +FROM ubuntu:17.04 RUN apt-get -qq update && apt-get install -yq \ autoconf \ automake \ build-essential \ cmake \ + libboost-all-dev \ libfreetype6-dev \ liblzma-dev \ - libboost-all-dev \ libpng-dev \ libtool \ m4 \ diff --git a/README.md b/README.md index 6c982d5..23381cf 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,21 @@ -# ParaGRAPH: a suite of graph-based genotyping tools +# Paragraph: a suite of graph-based genotyping tools * [Introduction](#Introduction) -* [Quick Start](#QuickStart) * [System Requirements](#SystemRequirements) * [Hardware](#Hardware) * [Operating systems](#Operatingsystems) - * [Helper scripts](#Helperscripts) - * [Library Dependencies](#LibraryDependencies) + * [Third-party libraries](#ThirdPartyLibraries) * [Installation](#Installation) -* [Using helper scripts to run paraGRAPH](#UsinghelperscriptstorunparaGRAPH) -* [Using vcf2paragraph.py to run paraGRAPH](#Usingvcf2paragraph.pytorunparaGRAPH) + * [Native build](#NativeBuild) + * [From Docker image](#FromDockerImage) +* [Run Paragraph from VCF](#RunParagraphFromVCF) + * [Example](#Example) + * [Input requirements](#InputRequirements) +* [Run Paragraph on complex variants](#RunParagraphOnComplexVariants) * [Further Information](#FurtherInformation) * [Documentation](#Documentation) - * [Links](#Links) + * [External links](#ExternalLinks) * [License](#License)