1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-18 14:21:49 -05:00

Merge pull request #530 from Unrud/fix_flatpak

Fix Flatpak build
This commit is contained in:
f4exb 2020-05-30 11:05:29 +02:00 committed by GitHub
commit 213d5ed82e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 32 deletions

View File

@ -354,9 +354,9 @@
], ],
"sources": [ "sources": [
{ {
"type": "git", "type": "archive",
"url": "https://github.com/myriadrf/LimeSuite.git", "url": "https://github.com/myriadrf/LimeSuite/archive/v20.01.0.tar.gz",
"commit": "025ffa1a" "sha256": "3c1d898185419074ada669b6cb93f409f4c97a29df8778284f30f93b7879754d"
} }
] ]
}, },
@ -498,7 +498,7 @@
"config-opts": [ "config-opts": [
"-Wno-dev", "-Wno-dev",
"-DDEBUG_OUTPUT=ON", "-DDEBUG_OUTPUT=ON",
"-DBUILD_TYPE=RELEASE", "-DCMAKE_BUILD_TYPE=RELEASE",
"-DRX_SAMPLE_24BIT=ON" "-DRX_SAMPLE_24BIT=ON"
], ],
"sources": [ "sources": [
@ -507,8 +507,8 @@
"path": ".." "path": ".."
}, },
{ {
"type": "patch", "type": "shell",
"path": "sdrangel-set-serialdv-path.patch" "commands": ["sed -e 's|/usr/|/app/|g' -i cmake/Modules/FindSerialDV.cmake"]
}, },
{ {
"type": "file", "type": "file",

View File

@ -1,26 +0,0 @@
diff --git a/cmake/Modules/FindSerialDV.cmake b/cmake/Modules/FindSerialDV.cmake
index e4c40b00a..07470e628 100644
--- a/cmake/Modules/FindSerialDV.cmake
+++ b/cmake/Modules/FindSerialDV.cmake
@@ -3,8 +3,8 @@
find_path(LIBSERIALDV_INCLUDE_DIR
NAMES dvcontroller.h
HINTS ${SERIALDV_DIR}/include/serialdv
- PATHS /usr/include/serialdv
- /usr/local/include/serialdv
+ PATHS /app/include/serialdv
+ /app/local/include/serialdv
)
set(LIBSERIAL_NAMES ${LIBSERIAL_NAMES} serialdv libserialdv)
@@ -12,8 +12,8 @@ set(LIBSERIAL_NAMES ${LIBSERIAL_NAMES} serialdv libserialdv)
find_library(LIBSERIALDV_LIBRARY
NAMES serialdv
HINTS ${SERIALDV_DIR}/lib
- PATHS /usr/lib
- /usr/local/lib
+ PATHS /app/lib
+ /app/local/lib
)
if (LIBSERIALDV_INCLUDE_DIR AND LIBSERIALDV_LIBRARY)