Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • med-team/fast
1 result
Show changes
Commits on Source (3)
......@@ -16,7 +16,10 @@ Build-Depends: debhelper-compat (= 12),
libopenslide-dev,
libopenigtlink-dev,
libdcmtk-dev,
git
libqt5opengl5-dev,
libqt5serialport5-dev,
qtbase5-dev,
libqt5core5a
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/med-team/fast
Vcs-Git: https://salsa.debian.org/med-team/fast.git
......
......@@ -6,8 +6,21 @@ Last-Update: 2019-08-08
Index: fast/cmake/InstallFAST.cmake
===================================================================
--- fast.orig/cmake/InstallFAST.cmake 2019-08-08 15:56:39.374462089 +0100
+++ fast/cmake/InstallFAST.cmake 2019-08-08 15:56:39.374462089 +0100
--- fast.orig/cmake/InstallFAST.cmake 2019-08-09 06:16:51.813007429 +0100
+++ fast/cmake/InstallFAST.cmake 2019-08-09 06:20:53.938997663 +0100
@@ -47,9 +47,9 @@
endif()
# Install Qt plugins
-install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/
- DESTINATION fast/QtPlugins/
-)
+#install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/
+# DESTINATION fast/QtPlugins/
+#)
# Install qt.conf
install(FILES ${PROJECT_SOURCE_DIR}/cmake/InstallFiles/qt.conf
@@ -185,18 +185,18 @@
)
......
......@@ -5,13 +5,32 @@ Author: Shayan Doust <hello@shayandoust.me>
Index: fast/CMakeLists.txt
===================================================================
--- fast.orig/CMakeLists.txt 2019-08-09 04:17:42.918244664 +0100
+++ fast/CMakeLists.txt 2019-08-09 04:17:57.242362402 +0100
@@ -170,6 +170,17 @@
--- fast.orig/CMakeLists.txt 2019-08-09 05:56:37.211023586 +0100
+++ fast/CMakeLists.txt 2019-08-09 05:57:42.647561464 +0100
@@ -34,7 +34,7 @@
option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF)
option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF)
option(FAST_CONTINUOUS_INTEGRATION "Used for continuous integration tests" OFF)
-option(FAST_BUILD_QT5 "Download and build Qt 5.8. Turn this OFF if you want to use pre-built binaries you already have on your machine." ON)
+option(FAST_BUILD_QT5 "Download and build Qt 5.8. Turn this OFF if you want to use pre-built binaries you already have on your machine." OFF)
# Python version
set(FAST_Python_Version "" CACHE STRING "Specify which Python version to build python wrappers with. E.g. 2 or 3")
@@ -157,7 +157,7 @@
#### Create FAST library and executables
add_library(FAST SHARED ${FAST_SOURCE_FILES} ${HEADERS_MOC})
-add_dependencies(FAST ${FAST_EXTERNAL_DEPENDENCIES})
+#add_dependencies(FAST ${FAST_EXTERNAL_DEPENDENCIES})
include(GenerateExportHeader)
generate_export_header(FAST EXPORT_FILE_NAME FASTExport.hpp)
@@ -170,6 +170,18 @@
qt5_use_modules(FAST Widgets OpenGL) # Add Qt 5 modules
endif()
+find_package(Eigen3 REQUIRED)
+find_package(Qt5 REQUIRED SerialPort)
+
+target_link_libraries(FAST PUBLIC Eigen3::Eigen)
+target_link_libraries(FAST PUBLIC openslide)
......