projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'probe' to 'channel' everywhere.
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 733bfe1f114865e7bac88851130b1b312c69e014..d85948c095afbd7713709f0705c5f334a8dddb66 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})
@@
-134,13
+138,12
@@
set(pulseview_SOURCES
pv/device/device.cpp
pv/device/file.cpp
pv/device/devinst.cpp
pv/device/device.cpp
pv/device/file.cpp
pv/device/devinst.cpp
- pv/device/inputfile.cpp
pv/device/sessionfile.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
pv/dialogs/storeprogress.cpp
pv/popups/deviceoptions.cpp
pv/device/sessionfile.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
pv/dialogs/storeprogress.cpp
pv/popups/deviceoptions.cpp
- pv/popups/
probe
s.cpp
+ pv/popups/
channel
s.cpp
pv/prop/bool.cpp
pv/prop/double.cpp
pv/prop/enum.cpp
pv/prop/bool.cpp
pv/prop/double.cpp
pv/prop/enum.cpp
@@
-182,7
+185,7
@@
set(pulseview_HEADERS
pv/dialogs/about.h
pv/dialogs/connect.h
pv/dialogs/storeprogress.h
pv/dialogs/about.h
pv/dialogs/connect.h
pv/dialogs/storeprogress.h
- pv/popups/
probe
s.h
+ pv/popups/
channel
s.h
pv/popups/deviceoptions.h
pv/prop/bool.h
pv/prop/double.h
pv/popups/deviceoptions.h
pv/prop/bool.h
pv/prop/double.h
@@
-243,12
+246,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)
@@
-277,7
+274,7
@@
endif()
#= Global Definitions
#-------------------------------------------------------------------------------
#= Global Definitions
#-------------------------------------------------------------------------------
-add_definitions(${QT_DEFINITIONS})
+add_definitions(${QT_DEFINITIONS}
-DQT_NO_KEYWORDS
)
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
add_definitions(-std=c++11)
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
add_definitions(-std=c++11)