Fix the C++11 thread linking issues for unit tests as well.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d63ecde143f291f179054ad6e278325c66153f0..f334f9118c024018179cd8fb433d2525790cce39 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,10 @@ if(ENABLE_DECODE)
        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})
 
@@ -77,7 +81,7 @@ if(Qt5Core_FOUND)
        message("-- Using Qt5")
        find_package(Qt5Widgets REQUIRED)
        find_package(Qt5Gui REQUIRED)
-       set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS})
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
        set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
        set(QT_LIBRARIES Qt5::Gui Qt5::Widgets)
        add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
@@ -88,6 +92,10 @@ endif()
 
 find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
 
+# Find the platform's thread library (needed for C++11 threads).
+# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
+find_package(Threads REQUIRED)
+
 #===============================================================================
 #= System Introspection
 #-------------------------------------------------------------------------------
@@ -120,6 +128,7 @@ configure_file (
 
 set(pulseview_SOURCES
        main.cpp
+       pv/application.cpp
        pv/devicemanager.cpp
        pv/mainwindow.cpp
        pv/sigsession.cpp
@@ -134,13 +143,12 @@ set(pulseview_SOURCES
        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/popups/probes.cpp
+       pv/popups/channels.cpp
        pv/prop/bool.cpp
        pv/prop/double.cpp
        pv/prop/enum.cpp
@@ -182,7 +190,7 @@ set(pulseview_HEADERS
        pv/dialogs/about.h
        pv/dialogs/connect.h
        pv/dialogs/storeprogress.h
-       pv/popups/probes.h
+       pv/popups/channels.h
        pv/popups/deviceoptions.h
        pv/prop/bool.h
        pv/prop/double.h
@@ -252,6 +260,10 @@ if(WIN32)
        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})
@@ -267,7 +279,7 @@ endif()
 #= 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)
@@ -310,6 +322,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 set(PULSEVIEW_LINK_LIBS
        ${Boost_LIBRARIES}
        ${QT_LIBRARIES}
+       ${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(STATIC_PKGDEPS_LIBS)
@@ -333,12 +346,25 @@ if(WIN32)
        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}
 )
+endif()
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})