| 1 |
jlec 13/01/28 08:35:06 |
| 2 |
|
| 3 |
Added: bamtools-2.2.3-unbundle.patch |
| 4 |
Log: |
| 5 |
sci-biology/bamtools: Version Bump; #452234; unbundles dev-libs/jsoncpp |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: bamtools-2.2.3-unbundle.patch |
| 16 |
=================================================================== |
| 17 |
src/CMakeLists.txt | 1 - |
| 18 |
src/api/CMakeLists.txt | 4 ++-- |
| 19 |
src/toolkit/bamtools_filter.cpp | 2 +- |
| 20 |
3 files changed, 3 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 23 |
index e359695..2bd2185 100644 |
| 24 |
--- a/src/CMakeLists.txt |
| 25 |
+++ b/src/CMakeLists.txt |
| 26 |
@@ -6,7 +6,6 @@ |
| 27 |
# ========================== |
| 28 |
|
| 29 |
add_subdirectory( api ) |
| 30 |
-add_subdirectory( third_party ) |
| 31 |
add_subdirectory( toolkit ) |
| 32 |
add_subdirectory( utils ) |
| 33 |
|
| 34 |
diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt |
| 35 |
index 66eb35f..65f4639 100644 |
| 36 |
--- a/src/api/CMakeLists.txt |
| 37 |
+++ b/src/api/CMakeLists.txt |
| 38 |
@@ -54,8 +54,8 @@ target_link_libraries( BamTools ${APILibs} ) |
| 39 |
target_link_libraries( BamTools-static ${APILibs} ) |
| 40 |
|
| 41 |
# set library install destinations |
| 42 |
-install( TARGETS BamTools LIBRARY DESTINATION "lib/bamtools" RUNTIME DESTINATION "bin") |
| 43 |
-install( TARGETS BamTools-static ARCHIVE DESTINATION "lib/bamtools") |
| 44 |
+install( TARGETS BamTools LIBRARY DESTINATION "lib${LIB_SUFFIX}" RUNTIME DESTINATION "bin") |
| 45 |
+install( TARGETS BamTools-static ARCHIVE DESTINATION "lib${LIB_SUFFIX}") |
| 46 |
|
| 47 |
# export API headers |
| 48 |
include(../ExportHeader.cmake) |
| 49 |
diff --git a/src/toolkit/bamtools_filter.cpp b/src/toolkit/bamtools_filter.cpp |
| 50 |
index 1189981..cf70199 100644 |
| 51 |
--- a/src/toolkit/bamtools_filter.cpp |
| 52 |
+++ b/src/toolkit/bamtools_filter.cpp |
| 53 |
@@ -16,7 +16,7 @@ |
| 54 |
#include <utils/bamtools_utilities.h> |
| 55 |
using namespace BamTools; |
| 56 |
|
| 57 |
-#include <jsoncpp/json.h> |
| 58 |
+#include <json/json.h> |
| 59 |
using namespace Json; |
| 60 |
|
| 61 |
#include <cstdio> |
Archives