This is an automated email from the git hooks/post-receive script. daube-guest pushed a commit to branch patch-queue/master in repository bamtools.
commit 63ee17aaa70586c27d8f44fee75eb2895677be4f Author: Debian Med Packaging Team <[email protected]> Date: Wed Nov 7 18:44:06 2012 -0700 ignore-thirdparty-and-fix-jsoncpp Gbp-Pq: Name 0001-ignore-thirdparty-and-fix-jsoncpp.patch --- src/CMakeLists.txt | 2 +- src/toolkit/CMakeLists.txt | 1 - src/toolkit/bamtools_filter.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e359695..636bd62 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,7 +6,7 @@ # ========================== add_subdirectory( api ) -add_subdirectory( third_party ) +#add_subdirectory( third_party ) add_subdirectory( toolkit ) add_subdirectory( utils ) diff --git a/src/toolkit/CMakeLists.txt b/src/toolkit/CMakeLists.txt index c781148..d074870 100644 --- a/src/toolkit/CMakeLists.txt +++ b/src/toolkit/CMakeLists.txt @@ -8,7 +8,6 @@ # set include path include_directories( ${BamTools_SOURCE_DIR}/src/api ${BamTools_SOURCE_DIR}/src/utils - ${BamTools_SOURCE_DIR}/src/third_party ) # compile main bamtools application diff --git a/src/toolkit/bamtools_filter.cpp b/src/toolkit/bamtools_filter.cpp index 2f17242..521e7c2 100644 --- a/src/toolkit/bamtools_filter.cpp +++ b/src/toolkit/bamtools_filter.cpp @@ -16,7 +16,7 @@ #include <utils/bamtools_utilities.h> using namespace BamTools; -#include <jsoncpp/json.h> +#include <jsoncpp/json/json.h> using namespace Json; #include <cstdio> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/bamtools.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
