Loading debian/control +1 −1 Original line number Diff line number Diff line Loading @@ -36,7 +36,7 @@ Description: framework for Heterogeneous Medical Image Computing . Contains client and server binaries. Package: libfast Package: libfast0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, Loading debian/libfast.installdeleted 100644 → 0 +0 −2 Original line number Diff line number Diff line debian/tmp/usr/fast/lib/libFAST.so usr/lib debian/tmp/usr/fast/kernels usr/lib/fast debian/patches/modify_libs_and_output.patch +7 −5 Original line number Diff line number Diff line Loading @@ -5,8 +5,8 @@ Author: Shayan Doust <hello@shayandoust.me> Index: fast/CMakeLists.txt =================================================================== --- fast.orig/CMakeLists.txt 2019-08-19 10:48:04.682259959 +0100 +++ fast/CMakeLists.txt 2019-08-19 10:48:04.678259926 +0100 --- fast.orig/CMakeLists.txt 2019-08-19 13:45:54.125541311 +0100 +++ fast/CMakeLists.txt 2019-08-19 13:46:54.290033490 +0100 @@ -34,7 +34,7 @@ option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF) option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF) Loading @@ -16,7 +16,7 @@ Index: fast/CMakeLists.txt # Python version set(FAST_Python_Version "" CACHE STRING "Specify which Python version to build python wrappers with. E.g. 2 or 3") @@ -157,10 +157,14 @@ @@ -157,10 +157,15 @@ #### Create FAST library and executables add_library(FAST SHARED ${FAST_SOURCE_FILES} ${HEADERS_MOC}) Loading @@ -28,11 +28,12 @@ Index: fast/CMakeLists.txt + +set_target_properties(FAST-STATIC PROPERTIES OUTPUT_NAME FAST CLEAN_DIRECT_OUTPUT 1) +set_target_properties(FAST PROPERTIES OUTPUT_NAME FAST SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) + include(cmake/OpenMP.cmake) ## Link everything @@ -170,6 +174,18 @@ @@ -170,6 +175,18 @@ qt5_use_modules(FAST Widgets OpenGL) # Add Qt 5 modules endif() Loading @@ -51,11 +52,12 @@ Index: fast/CMakeLists.txt ## Build test executable if(FAST_BUILD_TESTS) add_executable(testFAST ${FAST_TEST_SOURCE_FILES} source/FAST/Algorithms/CoherentPointDrift/Rigid.cpp source/FAST/Algorithms/CoherentPointDrift/Rigid.hpp source/FAST/Algorithms/CoherentPointDrift/Affine.cpp source/FAST/Algorithms/CoherentPointDrift/Affine.hpp) @@ -243,5 +259,7 @@ @@ -243,5 +260,8 @@ include(cmake/FASTCustomCommands.cmake) endif(NOT FAST_BUILD_QT5 AND WIN32) +install(TARGETS FAST-STATIC DESTINATION .) +install(TARGETS FAST DESTINATION .) + include(cmake/ModulePython.cmake) include(cmake/InstallFAST.cmake) debian/rules +4 −0 Original line number Diff line number Diff line Loading @@ -9,3 +9,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ override_dh_install: dh_install install -D -m 755 debian/tmp/usr/fast/lib/libFAST.so.0 debian/libfast0/usr/lib Loading
debian/control +1 −1 Original line number Diff line number Diff line Loading @@ -36,7 +36,7 @@ Description: framework for Heterogeneous Medical Image Computing . Contains client and server binaries. Package: libfast Package: libfast0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, Loading
debian/libfast.installdeleted 100644 → 0 +0 −2 Original line number Diff line number Diff line debian/tmp/usr/fast/lib/libFAST.so usr/lib debian/tmp/usr/fast/kernels usr/lib/fast
debian/patches/modify_libs_and_output.patch +7 −5 Original line number Diff line number Diff line Loading @@ -5,8 +5,8 @@ Author: Shayan Doust <hello@shayandoust.me> Index: fast/CMakeLists.txt =================================================================== --- fast.orig/CMakeLists.txt 2019-08-19 10:48:04.682259959 +0100 +++ fast/CMakeLists.txt 2019-08-19 10:48:04.678259926 +0100 --- fast.orig/CMakeLists.txt 2019-08-19 13:45:54.125541311 +0100 +++ fast/CMakeLists.txt 2019-08-19 13:46:54.290033490 +0100 @@ -34,7 +34,7 @@ option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF) option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF) Loading @@ -16,7 +16,7 @@ Index: fast/CMakeLists.txt # Python version set(FAST_Python_Version "" CACHE STRING "Specify which Python version to build python wrappers with. E.g. 2 or 3") @@ -157,10 +157,14 @@ @@ -157,10 +157,15 @@ #### Create FAST library and executables add_library(FAST SHARED ${FAST_SOURCE_FILES} ${HEADERS_MOC}) Loading @@ -28,11 +28,12 @@ Index: fast/CMakeLists.txt + +set_target_properties(FAST-STATIC PROPERTIES OUTPUT_NAME FAST CLEAN_DIRECT_OUTPUT 1) +set_target_properties(FAST PROPERTIES OUTPUT_NAME FAST SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) + include(cmake/OpenMP.cmake) ## Link everything @@ -170,6 +174,18 @@ @@ -170,6 +175,18 @@ qt5_use_modules(FAST Widgets OpenGL) # Add Qt 5 modules endif() Loading @@ -51,11 +52,12 @@ Index: fast/CMakeLists.txt ## Build test executable if(FAST_BUILD_TESTS) add_executable(testFAST ${FAST_TEST_SOURCE_FILES} source/FAST/Algorithms/CoherentPointDrift/Rigid.cpp source/FAST/Algorithms/CoherentPointDrift/Rigid.hpp source/FAST/Algorithms/CoherentPointDrift/Affine.cpp source/FAST/Algorithms/CoherentPointDrift/Affine.hpp) @@ -243,5 +259,7 @@ @@ -243,5 +260,8 @@ include(cmake/FASTCustomCommands.cmake) endif(NOT FAST_BUILD_QT5 AND WIN32) +install(TARGETS FAST-STATIC DESTINATION .) +install(TARGETS FAST DESTINATION .) + include(cmake/ModulePython.cmake) include(cmake/InstallFAST.cmake)
debian/rules +4 −0 Original line number Diff line number Diff line Loading @@ -9,3 +9,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ override_dh_install: dh_install install -D -m 755 debian/tmp/usr/fast/lib/libFAST.so.0 debian/libfast0/usr/lib