Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Fix pathing with the new asset location
· 0055b4c0
Shayan Doust
authored
Aug 31, 2019
0055b4c0
Use lowercase "FAST"
· b2cb5556
Shayan Doust
authored
Aug 31, 2019
b2cb5556
Show whitespace changes
Inline
Side-by-side
debian/libfast-data.install
View file @
b2cb5556
debian
/
missing
-
sources
/
FAST_Test_Data
.
xz
usr
/
lib
/
fast
doc
/
fonts
usr
/
share
/
doc
/
fast
/
assets
doc
/
images
usr
/
share
/
doc
/
fast
/
assets
debian/patches/modify_assets_location.patch
View file @
b2cb5556
Index: fast/source/FAST/Config.cpp
===================================================================
--- fast.orig/source/FAST/Config.cpp 2019-08-3
0 18:00:33.000000000
+0100
+++ fast/source/FAST/Config.cpp 2019-08-3
0 20:08:05.737080879
+0100
--- fast.orig/source/FAST/Config.cpp 2019-08-3
1 03:52:37.422447649
+0100
+++ fast/source/FAST/Config.cpp 2019-08-3
1 03:53:13.398310010
+0100
@@ -78,7 +78,7 @@
mTestDataPath = getPath() + "../data/";
mKernelSourcePath = getPath() + "../source/FAST/";
mKernelBinaryPath = getPath() + "kernel_binaries/";
- mDocumentationPath = getPath() + "../doc/";
+ mDocumentationPath = getPath() + "../share/doc/
FAST
/assets";
+ mDocumentationPath = getPath() + "../
usr/
share/doc/
fast
/assets
/
";
mPipelinePath = getPath() + "../pipelines/";
#ifdef WIN32
mLibraryPath = getPath() + "/bin/";
@@ -199,7 +199,7 @@
mTestDataPath = getPath() + "../data/";
mKernelSourcePath = getPath() + "../source/FAST/";
mKernelBinaryPath = getPath() + "kernel_binaries/";
- mDocumentationPath = getPath() + "../doc/";
+ mDocumentationPath = getPath() + "../usr/share/doc/fast/assets/";
mPipelinePath = getPath() + "../pipelines/";
loadConfiguration();
}
debian/patches/modify_libs_and_output.patch
View file @
b2cb5556
...
...
@@ -5,8 +5,8 @@ Author: Shayan Doust <hello@shayandoust.me>
Index: fast/CMakeLists.txt
===================================================================
--- fast.orig/CMakeLists.txt 2019-08-3
0 20:05:17.209725641
+0100
+++ fast/CMakeLists.txt 2019-08-3
0 20:05:54.753582003
+0100
--- fast.orig/CMakeLists.txt 2019-08-3
1 03:53:21.358279557
+0100
+++ fast/CMakeLists.txt 2019-08-3
1 03:53:45.362187721
+0100
@@ -34,7 +34,7 @@
option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF)
option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF)
...
...
@@ -60,9 +60,9 @@ Index: fast/CMakeLists.txt
# dlls automatically to the bin folder.
include(cmake/FASTCustomCommands.cmake)
endif(NOT FAST_BUILD_QT5 AND WIN32)
+execute_process(COMMAND mkdir -p share/doc/
FAST
/assets)
+execute_process(COMMAND cp -r ../doc/fonts share/doc/
FAST
/assets)
+execute_process(COMMAND cp -r ../doc/images share/doc/
FAST
/assets)
+execute_process(COMMAND mkdir -p
usr/
share/doc/
fast
/assets)
+execute_process(COMMAND cp -r ../doc/fonts
usr/
share/doc/
fast
/assets)
+execute_process(COMMAND cp -r ../doc/images
usr/
share/doc/
fast
/assets)
+install(TARGETS FAST-STATIC DESTINATION .)
+install(TARGETS FAST DESTINATION .)
...
...