Skip to content

Commits on Source 3

Show whitespace changes
Inline Side-by-side
debian/control
View file @ 51096a42
......@@ -9,7 +9,8 @@ Build-Depends: debhelper-compat (= 12),
libgstreamer-plugins-bad1.0-dev,
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
zlib1g-dev
zlib1g-dev,
libeigen3-dev
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/med-team/fast
Vcs-Git: https://salsa.debian.org/med-team/fast.git
......
debian/patches/series
View file @ 51096a42
use_system_eigen.patch
use_system_zlib.patch
disable_tests.patch
debian/patches/use_system_eigen.patch 0 → 100644
View file @ 51096a42
Index: fast/cmake/ExternalEigen.cmake
===================================================================
--- fast.orig/cmake/ExternalEigen.cmake 2019-07-26 15:41:31.256881570 +0100
+++ fast/cmake/ExternalEigen.cmake 2019-07-26 15:41:31.252881538 +0100
@@ -1,21 +1,21 @@
# Download and set up Eigen
-include(cmake/Externals.cmake)
+#include(cmake/Externals.cmake)
-ExternalProject_Add(eigen
- PREFIX ${FAST_EXTERNAL_BUILD_DIR}/eigen
- BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/eigen
- #GIT_REPOSITORY "https://github.com/RLovelett/eigen.git"
- #GIT_TAG "a46d2e7337c4656f00abe54a8115f6d76153a048"
- URL "https://bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz"
- INSTALL_DIR ${FAST_EXTERNAL_INSTALL_DIR}
- CMAKE_CACHE_ARGS
- -DCMAKE_BUILD_TYPE:STRING=Release
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
- -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
- -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
- -DBUILD_TESTING:BOOL=OFF
-)
+#ExternalProject_Add(eigen
+# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/eigen
+# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/eigen
+# #GIT_REPOSITORY "https://github.com/RLovelett/eigen.git"
+# #GIT_TAG "a46d2e7337c4656f00abe54a8115f6d76153a048"
+# URL "https://bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz"
+# INSTALL_DIR ${FAST_EXTERNAL_INSTALL_DIR}
+# CMAKE_CACHE_ARGS
+# -DCMAKE_BUILD_TYPE:STRING=Release
+# -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+# -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
+# -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
+# -DBUILD_TESTING:BOOL=OFF
+#)
-list(APPEND FAST_INCLUDE_DIRS ${FAST_EXTERNAL_INSTALL_DIR}/include/eigen3/)
-list(APPEND FAST_EXTERNAL_DEPENDENCIES eigen)
\ No newline at end of file
+#list(APPEND FAST_INCLUDE_DIRS ${FAST_EXTERNAL_INSTALL_DIR}/include/eigen3/)
+#list(APPEND FAST_EXTERNAL_DEPENDENCIES eigen)
Index: fast/cmake/InstallFAST.cmake
===================================================================
--- fast.orig/cmake/InstallFAST.cmake 2019-07-26 15:41:31.256881570 +0100
+++ fast/cmake/InstallFAST.cmake 2019-07-26 15:41:31.252881538 +0100
@@ -185,10 +185,10 @@
)
# Eigen
-file(GLOB LICENSE_FILES ${FAST_EXTERNAL_BUILD_DIR}/eigen/src/eigen/COPYING.*)
-install(FILES ${LICENSE_FILES}
- DESTINATION fast/licenses/eigen/
-)
+#file(GLOB LICENSE_FILES ${FAST_EXTERNAL_BUILD_DIR}/eigen/src/eigen/COPYING.*)
+#install(FILES ${LICENSE_FILES}
+# DESTINATION fast/licenses/eigen/
+#)
# zlib
install(FILES ${FAST_EXTERNAL_BUILD_DIR}/zlib/src/zlib/README
DESTINATION fast/licenses/zlib/
Index: fast/CMakeLists.txt
===================================================================
--- fast.orig/CMakeLists.txt 2019-07-26 15:41:31.256881570 +0100
+++ fast/CMakeLists.txt 2019-07-26 15:42:22.785300550 +0100
@@ -153,7 +153,7 @@
endif()
endif()
-
+find_package(Eigen3 REQUIRED)
#### Create FAST library and executables
add_library(FAST SHARED ${FAST_SOURCE_FILES} ${HEADERS_MOC})
@@ -169,7 +169,7 @@
if(FAST_MODULE_Visualization AND FAST_BUILD_QT5)
qt5_use_modules(FAST Widgets OpenGL) # Add Qt 5 modules
endif()
-
+target_link_libraries(FAST PUBLIC Eigen3::Eigen)
## 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)
debian/rules
View file @ 51096a42
......@@ -9,3 +9,6 @@ include /usr/share/dpkg/default.mk
%:
dh $@
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info