projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generic auto-focusing for first line edit of popup
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 40e61e22a1f2d0c1679a4f6b63e9766499424461..2fd35b1c3a1ee389fa1587ff2c2cafdf624c2686 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})
@@
-120,6
+124,7
@@
configure_file (
set(pulseview_SOURCES
main.cpp
set(pulseview_SOURCES
main.cpp
+ pv/application.cpp
pv/devicemanager.cpp
pv/mainwindow.cpp
pv/sigsession.cpp
pv/devicemanager.cpp
pv/mainwindow.cpp
pv/sigsession.cpp
@@
-134,13
+139,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
+186,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
@@
-252,6
+256,10
@@
if(WIN32)
list(APPEND pulseview_SOURCES pulseviewico.rc)
endif()
list(APPEND pulseview_SOURCES pulseviewico.rc)
endif()
+if(ANDROID)
+ list(APPEND pulseview_SOURCES android/loghandler.cpp)
+endif()
+
if(Qt5Core_FOUND)
qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
if(Qt5Core_FOUND)
qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
@@
-267,7
+275,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)
@@
-333,12
+341,25
@@
if(WIN32)
list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg")
endif()
list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg")
endif()
+if(ANDROID)
+ list(APPEND PULSEVIEW_LINK_LIBS "-llog")
+endif()
+
+if(ANDROID)
+add_library(${PROJECT_NAME} SHARED
+ ${pulseview_SOURCES}
+ ${pulseview_HEADERS_MOC}
+ ${pulseview_FORMS_HEADERS}
+ ${pulseview_RESOURCES_RCC}
+)
+else()
add_executable(${PROJECT_NAME}
${pulseview_SOURCES}
${pulseview_HEADERS_MOC}
${pulseview_FORMS_HEADERS}
${pulseview_RESOURCES_RCC}
)
add_executable(${PROJECT_NAME}
${pulseview_SOURCES}
${pulseview_HEADERS_MOC}
${pulseview_FORMS_HEADERS}
${pulseview_RESOURCES_RCC}
)
+endif()
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})