Merge pull request #107 from kipr/erinQt6Upgrade

Erin qt6 upgrade

Author: tcorbly

.github/workflows/action.yml

@@ -0,0 +1,20 @@
+name: Change Wombat Serial Number
+on: push
+
+concurrency:
+group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+cancel-in-progress: true
+
+jobs:
+changeSerialNumber:
+name: Wombat Serial Number
+runs-on: ubuntu-latest
+steps:
+- uses: actions/checkout@v2
+  with:
+    fetch-depth: 11 # This value must be set if the lookback configuration option is not disabled for find-code-references. Read more: https://github.com/launchdarkly/ld-find-code-refs#searching-for-unused-flags-extinctions
+- name: Wombat Serial Number
+  uses: actions/checkout@v2
+  with:
+    accessToken: ${{ secrets.WS_ACCESS_TOKEN }}
+    projKey: SERIAL_NUM

.gitignore

@@ -3,3 +3,4 @@ build
 deploy
 lib
 obj-arm-linux-gnueabihf
+.vscode

CMakeLists.txt

@@ -1,31 +1,53 @@
 project(botui)
 
-option(qt5 "Use Qt5 instead of Qt4" OFF)
-option(wallaby "Use the Wallaby controller" ON)
+option(wombat "Use the Wombat controller" ON)
+option(DEBUG "Enable debug mode" OFF)
+option(RELEASE "Enable release mode" OFF)
+option(docker_cross "Cross compile option for docker container" OFF)
+
+cmake_minimum_required(VERSION 2.8.11)
+
+#if (wallaby)
+ # add_definitions(-DWALLABY)
+  #set(DEVICE_DIR ${CMAKE_SOURCE_DIR}/devices/wallaby)
+  #find_package(OpenCV REQUIRED)
+#else()
+ # set(DEVICE_DIR ${CMAKE_SOURCE_DIR}/devices/kovan)
+  
+#endif()
+
+set(LIBKAR_ROOT ${CMAKE_SOURCE_DIR}/../libkar)
+set(PCOMPILER_ROOT ${CMAKE_SOURCE_DIR}/../pcompiler)
+set(LIBKIPR_ROOT ${CMAKE_SOURCE_DIR}/../libwallaby)
+set(CREATE3_ROOT ${CMAKE_SOURCE_DIR}/../create3)
+
+include_directories(/usr/local/include)
 
-if(NOT qt5)
-  cmake_minimum_required(VERSION 2.6.0)
-else()
-  cmake_minimum_required(VERSION 2.8.11)
+if(wombat)
+	add_definitions(-DWOMBAT)
+	set(DEVICE_DIR ${CMAKE_SOURCE_DIR}/devices/wombat)
 endif()
 
-if (wallaby)
-  add_definitions(-DWALLABY)
-  set(DEVICE_DIR ${CMAKE_SOURCE_DIR}/devices/wallaby)
-else()
-  set(DEVICE_DIR ${CMAKE_SOURCE_DIR}/devices/kovan)
+if(docker_cross)
+	link_directories("${LIBKAR_ROOT}/lib")
+	link_directories("${PCOMPILER_ROOT}/lib")
+	link_directories("${LIBKIPR_ROOT}/build")
+	include_directories(/usr/local/include)
 endif()
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/deploy)
-
+set(CMAKE_THREAD_LIBS_INIT "-lpthread")
+set(CMAKE_HAVE_THREADS_LIBRARY 1)
+set(CMAKE_USE_WIN32_THREADS_INIT 0)
+set(CMAKE_USE_PTHREADS_INIT 1)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
 set(INCLUDE ${CMAKE_SOURCE_DIR}/include/botui)
+set(WOMBAT ${DEVICES}/kipr)
 set(RC ${CMAKE_SOURCE_DIR}/rc)
 set(SRC ${CMAKE_SOURCE_DIR}/src)
 set(UI ${CMAKE_SOURCE_DIR}/ui)
 set(TS ${CMAKE_SOURCE_DIR}/ts)
 
-set(DBUS ${CMAKE_SOURCE_DIR}/dbus)
-
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/src
@@ -35,29 +57,19 @@ include_directories(
 	${INCLUDE}
 )
 
-if(NOT qt5)
-  cmake_minimum_required(VERSION 2.6.0)
-  find_package(Qt4 REQUIRED)
-  find_package( PythonInterp 2.7 REQUIRED )
-  find_package( PythonLibs 2.7 REQUIRED )
-  set(QT_USE_QTDECLARATIVE TRUE)
-  set(QT_USE_QTNETWORK TRUE)
-  set(QT_USE_QTDBUS TRUE)
-
-  include(${QT_USE_FILE})
-else()
+
 
-  find_package(Qt5Widgets REQUIRED)
-  find_package(Qt5Declarative REQUIRED)
-  find_package(Qt5Network REQUIRED)
-endif()
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets Network Quick QuickWidgets QuickControls2)
+ 
+
 
 find_package(OpenSSL REQUIRED)
 
 file(GLOB INCLUDES ${INCLUDE}/*.h ${DEVICE_DIR}/include/*.h)
 file(GLOB SOURCES ${SRC}/*.cpp ${DEVICE_DIR}/src/*.cpp)
 file(GLOB UIS ${UI}/*)
 file(GLOB TS_FILES ${TS}/*.ts)
+file(GLOB DBUS_INTERFACES ${DBUS}/*.xml)
 
 set(UI ${UIS})
 
@@ -69,75 +81,63 @@ set(QRC_FILES
 	${RC}/target.qrc
 )
 
-if(NOT qt5)
-  file(GLOB DBUS_INCLUDES ${DBUS}/include/*.h)
-  file(GLOB DBUS_SOURCES ${DBUS}/src/*.cpp)
-  set(INCLUDES ${INCLUDES} ${DBUS_INCLUDES})
-  set(SOURCES ${SOURCES} ${DBUS_SOURCES})
-  
-  set(MOC_SRCS ${INCLUDES})
-  set(SRCS_CXX ${SOURCES})
+
 
-  QT4_WRAP_CPP(SRCS_CXX ${MOC_SRCS} OPTIONS -DQT_VERSION=0x040000)
-  QT4_WRAP_UI(SRCS_CXX ${UI})
-  QT4_ADD_RESOURCES(SRCS_CXX ${QRC_FILES})
-  QT4_ADD_TRANSLATION(QM_FILES ${TS_FILES})
-else()
-  # set(CMAKE_AUTOMOC ON)
-  set(MOC_SRCS ${INCLUDES})
-  set(SRCS_CXX ${SOURCES})
-  qt5_wrap_cpp(SRCS_CXX ${MOC_SRCS} OPTIONS -DQT_VERSION=0x050000 -UQT_DBUS_LIB)
-  qt5_wrap_ui(SRCS_CXX ${UI})
-  qt5_add_resources(SRCS_CXX ${QRC_FILES})
-  qt5_add_translation(QM_FILES ${TS_FILES})
-endif()
+ 
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(MOC_SRCS ${INCLUDES})
+set(SRCS_CXX ${SOURCES})
+qt6_wrap_cpp(SRCS_CXX ${MOC_SRCS} OPTIONS -DQT_VERSION=0x060000 -UQT_DBUS_LIB)
+qt6_wrap_ui(SRCS_CXX ${UI})
+qt6_add_resources(SRCS_CXX ${QRC_FILES})
+
 
 add_definitions(-Wall)
 
-# C++11
-# http://www.guyrutenberg.com/2014/01/05/enabling-c11-c0x-in-cmake/
-include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-if(COMPILER_SUPPORTS_CXX11)
-  add_definitions(--std=c++11)
-elseif(COMPILER_SUPPORTS_CXX0X)
-  add_definitions(--std=c++0x)
-else()
-  message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
-endif()
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-IF(APPLE)
-  add_definitions(-g)
-	link_directories(/Library/Frameworks/ /usr/local/lib)
-  include_directories(/usr/local/include)
-ELSEIF(WIN32)
-	set(CMAKE_CXX_FLAGS "-Wl,--enable-auto-import")
-ENDIF()
+add_executable(botui ${SRCS_CXX} ${QM_FILES} ${DBUS_INTERFACE_SOURCES})
 
-if(WIN32)
-	add_executable(botui WIN32 ${SRCS_CXX} ${QM_FILES})
-else()
-  add_executable(botui ${SRCS_CXX} ${QM_FILES})
+if (DEBUG)
+	add_definitions(-g)
 endif()
 
-add_definitions(-O3)
+if (RELEASE)
+	add_definitions(-O3)
+endif()
+
+add_subdirectory(dbus)
+
+target_link_libraries(botui
+	Qt6::Core
+	Qt6::Gui
+	Qt6::Quick
+	Qt6::QuickWidgets
+	Qt6::Widgets
+	Qt6::QuickControls2
+	network_manager_dbus
+	pcompiler
+	z
+	${OPENSSL_LIBRARIES}
+	create3_client
+)
 
-target_link_libraries(botui pcompiler z opencv_core opencv_highgui opencv_imgproc ${OPENSSL_LIBRARIES})
-IF(wallaby)
-  target_link_libraries(botui wallaby)
-ELSEIF(wombat)
+IF(wombat)
   target_link_libraries(botui kipr)
-ELSE()
-  target_link_libraries(botui kovan)
 ENDIF()
 
-if(NOT qt5)
-  target_link_libraries(botui ${QT_LIBRARIES})
-else()
-  qt5_use_modules(botui Widgets Declarative Network)
-endif()
+target_link_libraries(botui ${QT_LIBRARIES})
 
 
 install(TARGETS botui DESTINATION bin)
 install(FILES ${QM_FILES} DESTINATION "/etc/botui/locale")
+
+set(CPACK_PACKAGE_NAME botui)
+set(CPACK_GENERATOR "DEB")
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm64)
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "KISS Institute for Practical Robotics")
+set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+include(CPack)

README.md

@@ -11,7 +11,6 @@ Requirements
 ============
 * [pcompiler ](https://github.com/kipr/pcompiler)
 * CMake 2.6.0 or later
-* OpenCV
 * [Qt >= 4.7.4](https://www.qt.io/download-qt-installer)
 
 
@@ -22,7 +21,7 @@ git clone https://github.com/kipr/botui
 cd botui
 mkdir build
 cd build
-cmake ..
+cmake .. or /home/<container name>/qt-raspi/bin/qt-cmake -Ddocker_cross=ON .. (for docker cross compilation)
 make -j4
 sudo make install
 ```

dbus/CMakeLists.txt

@@ -0,0 +1,25 @@
+find_package(Qt6 REQUIRED COMPONENTS DBus)
+
+set(NETWORK_MANAGER_INTERFACES
+  org.freedesktop.NetworkManager.Device.Wireless
+  org.freedesktop.NetworkManager.Device
+  org.freedesktop.NetworkManager.Settings.Connection
+  org.freedesktop.NetworkManager.Settings
+  org.freedesktop.NetworkManager.AccessPoint
+  org.freedesktop.NetworkManager.IP4Config
+  org.freedesktop.NetworkManager.Connection.Active
+  org.freedesktop.NetworkManager
+)
+
+set(NETWORK_MANAGER_SOURCES)
+foreach (interface ${NETWORK_MANAGER_INTERFACES})
+  string (REPLACE "." "_" basename ${interface})
+  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/${interface}.xml PROPERTIES NO_NAMESPACE ON)
+  qt_add_dbus_interface(INTERFACE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/${interface}.xml ${basename})
+  message(STATUS "Adding DBus interface ${interface} ${NETWORK_MANAGER_SOURCES}")
+  list(APPEND NETWORK_MANAGER_SOURCES ${INTERFACE_SOURCES})
+endforeach()
+
+add_library(network_manager_dbus STATIC ${NETWORK_MANAGER_SOURCES})
+target_link_libraries(network_manager_dbus PUBLIC Qt::DBus)
+target_include_directories(network_manager_dbus PUBLIC ${CMAKE_CURRENT_BINARY_DIR})