projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Android: Use environment setup from library instead
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 733bfe1f114865e7bac88851130b1b312c69e014..069ccd898b8be8501434840c16db3c28325b1750 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-64,6
+64,10
@@
if(ENABLE_DECODE)
list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
endif()
list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
endif()
+if(ANDROID)
+ list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0)
+endif()
+
find_package(PkgConfig)
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
find_package(PkgConfig)
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
@@
-243,12
+247,6
@@
if(ENABLE_DECODE)
pv/widgets/decodergroupbox.h
pv/widgets/decodermenu.h
)
pv/widgets/decodergroupbox.h
pv/widgets/decodermenu.h
)
-
- if(ANDROID)
- list(APPEND pulseview_SOURCES
- android/envsetup.cpp
- )
- endif()
endif()
if(WIN32)
endif()
if(WIN32)