X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fpatches%2Fcmake_fixup;h=605c82ce0d891dfc8d803727b77c09a76fc0213e;hb=73771b1eea3669a1e394e5161efc1f2fee48279d;hp=d37a709de78171c3356b13e8c8cb97c19390a194;hpb=2126ee0d204be8293df9492b48bce076a41a2a25;p=bamtools.git

diff --git a/debian/patches/cmake_fixup b/debian/patches/cmake_fixup
index d37a709..605c82c 100644
--- a/debian/patches/cmake_fixup
+++ b/debian/patches/cmake_fixup
@@ -17,32 +17,14 @@
  # list third-party subdirectories to build in
 -add_subdirectory( jsoncpp )
 +# add_subdirectory( jsoncpp )
---- a/src/utils/CMakeLists.txt
-+++ b/src/utils/CMakeLists.txt
-@@ -20,11 +20,26 @@
-              bamtools_utilities.cpp
-            )
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,6 +38,8 @@
+ set( EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin" )
+ set( LIBRARY_OUTPUT_PATH    "${CMAKE_SOURCE_DIR}/lib" )
  
-+add_library( BamTools-utils-static STATIC 
-+             bamtools_fasta.cpp
-+             bamtools_options.cpp
-+             bamtools_pileup_engine.cpp
-+             bamtools_utilities.cpp
-+	     )
-+set_target_properties(BamTools-utils-static PROPERTIES 
-+	     OUTPUT_NAME "bamtools-utils"
-+	     PREFIX "lib"
-+	     )
++SET(CMAKE_INSTALL_RPATH "/usr/lib/bamtools")
 +
- # link BamTools-utils library with BamTools automatically
- target_link_libraries( BamTools-utils BamTools )
-+target_link_libraries( BamTools-utils-static BamTools )
- 
- # set BamTools library properties
- set_target_properties( BamTools-utils PROPERTIES
-                        SOVERSION   2.2.0
-                        OUTPUT_NAME bamtools-utils
-                      )
-+
-+install( TARGETS BamTools-utils LIBRARY DESTINATION "lib/bamtools" RUNTIME DESTINATION "bin")
-+install( TARGETS BamTools-utils-static ARCHIVE DESTINATION "lib/bamtools")
+ # define compiler flags for all code
+ set( CMAKE_BUILD_TYPE Release )
+ add_definitions( -Wall -D_FILE_OFFSET_BITS=64 )