blob: 47d14b54c5a27e8ad48b86678ef1d1b2ed5191b8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
src/CMakeLists.txt | 1 -
src/api/CMakeLists.txt | 4 ++--
src/toolkit/bamtools_filter.cpp | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e359695..2bd2185 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@
# ==========================
add_subdirectory( api )
-add_subdirectory( third_party )
add_subdirectory( toolkit )
add_subdirectory( utils )
diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
index 66eb35f..65f4639 100644
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@@ -54,8 +54,8 @@ 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-static ARCHIVE DESTINATION "lib/bamtools")
+install( TARGETS BamTools LIBRARY DESTINATION "lib${LIB_SUFFIX}" RUNTIME DESTINATION "bin")
+install( TARGETS BamTools-static ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
# export API headers
include(../ExportHeader.cmake)
diff --git a/src/toolkit/bamtools_filter.cpp b/src/toolkit/bamtools_filter.cpp
index 1189981..cf70199 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 <json/json.h>
using namespace Json;
#include <cstdio>
|
GitWeb
