Commit cf7f99c6 authored by patrick pereira's avatar patrick pereira 🏃
Browse files
parent 040c7870
......@@ -79,7 +79,6 @@ endif()
set(kirogi_SRCS
main.cpp
permissions.cpp
autosettingshandler.cpp
${ANDROID_HEADERS}
${ANDROID_SOURCES}
)
......@@ -90,8 +89,6 @@ ecm_qt_declare_logging_category(kirogi_SRCS
CATEGORY_NAME "kirogi.app"
)
kconfig_add_kcfg_files(kirogi_SRCS GENERATE_MOC settings.kcfgc)
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../data/icons/*apps-kirogi.svg")
ecm_add_app_icon(kirogi_SRCS ICONS ${ICONS_SRCS})
......@@ -143,6 +140,7 @@ target_link_libraries(kirogi
KF5::I18n
gstreamer
${GSTREAMER_LIBRARIES}
settings
)
if(NOT ANDROID)
......@@ -177,5 +175,4 @@ else()
)
endif()
install(FILES kirogi.kcfg DESTINATION ${KCFG_INSTALL_DIR})
install(TARGETS kirogi ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
......@@ -30,6 +30,7 @@ ecm_generate_headers(Kirogi_CamelCase_HEADERS
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../)
add_subdirectory(positionsource)
add_subdirectory(settings)
add_subdirectory(vehicleparameters)
add_library(kirogicore SHARED ${kirogicore_SRCS} ${Kirogi_HEADERS})
......@@ -74,6 +75,7 @@ target_link_libraries(kirogicore
KF5::I18n
KF5::ConfigGui
positionsource
settings
vehicleparameters
)
......@@ -130,6 +132,7 @@ target_link_libraries(kirogiqtquickplugin
Qt5::Quick
KirogiCore
positionsource
settings
vehicleparameters
)
......
#include "joystickconfiguration.h"
#include "autosettingshandler.h"
#include <QEasingCurve>
......
......@@ -3,7 +3,6 @@
#include <QtGlobal>
#include "kirogicore_export.h"
#include "settings.h"
namespace Kirogi
{
......
set(settings_SRCS
autosettingshandler.cpp
)
ecm_qt_declare_logging_category(settings_SRCS
HEADER debug.h
IDENTIFIER SETTINGS
CATEGORY_NAME "kirogi.settings"
)
add_library(
settings
STATIC
${settings_SRCS}
)
kconfig_add_kcfg_files(settings_SRCS GENERATE_MOC settings.kcfgc)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_options(settings PRIVATE
-pedantic
-Woverloaded-virtual
-Wunused
-Wall
-Wextra
-Wshadow
-Wnon-virtual-dtor
-Wold-style-cast
)
if(CMAKE_COMPILER_IS_GNUCXX)
target_compile_options(settings PRIVATE
-Wduplicated-cond
-Wduplicated-branches
-Wlogical-op
-Wnull-dereference
-fsanitize=leak
)
endif()
endif()
target_link_libraries(settings
PRIVATE
Qt5::Core
KF5::ConfigWidgets
)
install(FILES kirogi.kcfg DESTINATION ${KCFG_INSTALL_DIR})
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment