Andreas Tille pushed to branch master at Debian Med / discosnp
Commits:
0a25d266 by Andreas Tille at 2019-01-23T08:16:15Z
dh_auto_build works now
- - - - -
2 changed files:
- debian/patches/use_debian_packaged_gatb-core.patch
- debian/rules
Changes:
=====================================
debian/patches/use_debian_packaged_gatb-core.patch
=====================================
@@ -17,27 +17,39 @@ Description: Use cmake input file of Debian packaged
gatb-core
# THIRD PARTIES
--- a/tools/QHC/CMakeLists.txt
+++ b/tools/QHC/CMakeLists.txt
-@@ -22,7 +22,9 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BIN
+@@ -16,13 +16,15 @@ include_directories (src ${gatb-core-in
+ file (GLOB_RECURSE ProjectFiles src/*)
+
+ # we define the artifact to be built: the project binary
++include(GNUInstallDirs)
++LINK_DIRECTORIES( /usr/${CMAKE_INSTALL_LIBDIR}/hdf5/serial )
+ add_executable (${PROJECT_NAME} ${ProjectFiles})
+
+ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIRZ})
# we define which libraries to be linked with project binary
-target_link_libraries (${PROJECT_NAME} ${gatb-core-libraries})
-+include(GNUInstallDirs)
-+LINK_DIRECTORIES( /usr/${CMAKE_INSTALL_LIBDIR}/hdf5/serial )
-+target_link_libraries (${PROJECT_NAME} gatbcore hdf5 )
++target_link_libraries (${PROJECT_NAME} gatbcore hdf5 z )
# We copy the project binary to the 'bin' directory
--- a/tools/kissnp2/CMakeLists.txt
+++ b/tools/kissnp2/CMakeLists.txt
-@@ -22,8 +22,10 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BIN
+@@ -16,14 +16,16 @@ include_directories (src ${gatb-core-in
+ file (GLOB_RECURSE ProjectFiles src/*)
+
+ # we define the artifact to be built: the project binary
++include(GNUInstallDirs)
++LINK_DIRECTORIES( /usr/${CMAKE_INSTALL_LIBDIR}/hdf5/serial )
+ add_executable (${PROJECT_NAME} ${ProjectFiles})
+
+ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIRZ})
# we define which libraries to be linked with project binary
-target_link_libraries (${PROJECT_NAME} ${gatb-core-libraries})
-+include(GNUInstallDirs)
-+LINK_DIRECTORIES( /usr/${CMAKE_INSTALL_LIBDIR}/hdf5/serial )
-+target_link_libraries (${PROJECT_NAME} gatbcore hdf5 )
++target_link_libraries (${PROJECT_NAME} gatbcore hdf5 z )
# We copy the project binary to the 'bin' directory
@@ -46,14 +58,20 @@ Description: Use cmake input file of Debian packaged
gatb-core
+INSTALL (TARGETS ${PROJECT_NAME} DESTINATION bin)
--- a/tools/kissreads2/CMakeLists.txt
+++ b/tools/kissreads2/CMakeLists.txt
-@@ -22,8 +22,10 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BIN
+@@ -16,14 +16,16 @@ include_directories (src ${gatb-core-in
+ file (GLOB_RECURSE ProjectFiles src/*)
+
+ # we define the artifact to be built: the project binary
++include(GNUInstallDirs)
++LINK_DIRECTORIES( /usr/${CMAKE_INSTALL_LIBDIR}/hdf5/serial )
+ add_executable (${PROJECT_NAME} ${ProjectFiles})
+
+ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIRZ})
# we define which libraries to be linked with project binary
-target_link_libraries (${PROJECT_NAME} ${gatb-core-libraries})
-+include(GNUInstallDirs)
-+LINK_DIRECTORIES( /usr/${CMAKE_INSTALL_LIBDIR}/hdf5/serial )
-+target_link_libraries (${PROJECT_NAME} gatbcore hdf5 )
++target_link_libraries (${PROJECT_NAME} gatbcore hdf5 z )
# We copy the project binary to the 'bin' directory
@@ -62,14 +80,20 @@ Description: Use cmake input file of Debian packaged
gatb-core
+INSTALL (TARGETS ${PROJECT_NAME} DESTINATION bin)
--- a/tools/read_file_names/CMakeLists.txt
+++ b/tools/read_file_names/CMakeLists.txt
-@@ -22,8 +22,10 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BIN
+@@ -16,14 +16,16 @@ include_directories (src ${gatb-core-in
+ file (GLOB_RECURSE ProjectFiles src/*)
+
+ # we define the artifact to be built: the project binary
++include(GNUInstallDirs)
++LINK_DIRECTORIES( /usr/${CMAKE_INSTALL_LIBDIR}/hdf5/serial )
+ add_executable (${PROJECT_NAME} ${ProjectFiles})
+
+ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIRZ})
# we define which libraries to be linked with project binary
-target_link_libraries (${PROJECT_NAME} ${gatb-core-libraries})
-+include(GNUInstallDirs)
-+LINK_DIRECTORIES( /usr/${CMAKE_INSTALL_LIBDIR}/hdf5/serial )
-+target_link_libraries (${PROJECT_NAME} gatbcore hdf5 )
++target_link_libraries (${PROJECT_NAME} gatbcore hdf5 z )
# We copy the project binary to the 'bin' directory
=====================================
debian/rules
=====================================
@@ -8,3 +8,6 @@ include /usr/share/dpkg/default.mk
%:
dh $@
dh_clean
+
+override_dh_auto_configure:
+ dh_auto_configure --
-DLINK_DIRECTORIES:STRING='/usr/$(DEB_HOST_MULTIARCH)/hdf5/serial' #
--trace-expand
View it on GitLab:
https://salsa.debian.org/med-team/discosnp/commit/0a25d26692064f403ea02242af8263f028c4bee9
--
View it on GitLab:
https://salsa.debian.org/med-team/discosnp/commit/0a25d26692064f403ea02242af8263f028c4bee9
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
