diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .kdev4 .directory -firsttimewizard.h *.kdev4 diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ ########### install target ############### find_package(ECM REQUIRED) +find_package(KDevPlatform REQUIRED 5.0) set(CMAKE_MODULE_PATH ${KDevPlatform_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) @@ -28,7 +29,6 @@ set(KDEVEMBEDDED_PART_UI arduinowindow.ui - firsttimewizard.ui ) set(KDEVEMBEDDED_LAUNCHER_PART_SRCS @@ -44,28 +44,31 @@ set(KDEVEMBEDDED_LAUNCHER_PART_UIS launcher/embeddedlauncher.ui + firsttimewizard.ui ) add_definitions( -DQT_NO_CAST_FROM_ASCII ) -find_package(KDevPlatform REQUIRED) - find_package(KF5 REQUIRED Archive I18n NewStuff ItemModels TextEditor ThreadWeaver) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) -#include(${CMAKE_CURRENT_SOURCE_DIR}/launcher/CMakeLists.txt) - ki18n_wrap_ui(KDEVEMBEDDED_PART_SRCS ${KDEVEMBEDDED_PART_UI}) ki18n_wrap_ui(KDEVEMBEDDED_LAUNCHER_PART_SRCS ${KDEVEMBEDDED_LAUNCHER_PART_UIS}) qt5_add_resources(KDEVEMBEDDED_PART_SRCS kdevembedded.qrc) -kdevplatform_add_plugin(kdevembedded JSON kdevembedded.json SOURCES ${KDEVEMBEDDED_PART_SRCS}) -kdevplatform_add_plugin(kdevembedded-launcher JSON launcher/kdevembedded-launcher.json SOURCES ${KDEVEMBEDDED_LAUNCHER_PART_SRCS}) +kdevplatform_add_plugin(kdevembedded + JSON kdevembedded.json + SOURCES ${KDEVEMBEDDED_PART_SRCS} +) +kdevplatform_add_plugin(kdevembedded-launcher + JSON launcher/kdevembedded-launcher.json + SOURCES ${KDEVEMBEDDED_LAUNCHER_PART_SRCS} +) target_link_libraries(kdevembedded KF5::Archive @@ -88,8 +91,9 @@ KDev::Shell ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/firsttimewizard.h.in ${CMAKE_CURRENT_SOURCE_DIR}/firsttimewizard.h) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/toolkit.h.in ${CMAKE_CURRENT_SOURCE_DIR}/toolkit.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/arduinoversion.h.in + ${CMAKE_CURRENT_BINARY_DIR}/arduinoversion.h +) install(DIRECTORY boardsimg DESTINATION ${DATA_INSTALL_DIR}/kdevembedded) diff --git a/arduinoversion.h.in b/arduinoversion.h.in new file mode 100644 --- /dev/null +++ b/arduinoversion.h.in @@ -0,0 +1,8 @@ +#ifndef ARDUINOVERSION_H +#define ARDUINOVERSION_H + +#define ARDUINO_SDK_VERSION "${ARDUINO_SDK_VERSION}" +#define ARDUINO_SDK_VERSION_NAME "${ARDUINO_SDK_VERSION_NAME}" +#define ARDUINO_SDK_MIN_VERSION_NAME "${ARDUINO_SDK_MIN_VERSION_NAME}" + +#endif // ARDUINOVERSION_H diff --git a/firsttimewizard.h.in b/firsttimewizard.h rename from firsttimewizard.h.in rename to firsttimewizard.h --- a/firsttimewizard.h.in +++ b/firsttimewizard.h @@ -31,9 +31,7 @@ #include "ui_firsttimewizard.h" -#define ARDUINO_SDK_VERSION "${ARDUINO_SDK_VERSION}" -#define ARDUINO_SDK_VERSION_NAME "${ARDUINO_SDK_VERSION_NAME}" -#define ARDUINO_SDK_MIN_VERSION_NAME "${ARDUINO_SDK_MIN_VERSION_NAME}" +#include "arduinoversion.h" Q_DECLARE_LOGGING_CATEGORY(FtwIo) Q_DECLARE_LOGGING_CATEGORY(FtwMsg) diff --git a/launcher/embeddedlauncher.cpp b/launcher/embeddedlauncher.cpp --- a/launcher/embeddedlauncher.cpp +++ b/launcher/embeddedlauncher.cpp @@ -67,7 +67,7 @@ #include #include - #include "firsttimewizard.h" +#include "firsttimewizard.h" using namespace KDevelop; using namespace Solid; diff --git a/toolkit.h.in b/toolkit.h rename from toolkit.h.in rename to toolkit.h --- a/toolkit.h.in +++ b/toolkit.h @@ -26,7 +26,7 @@ #include -#define ARDUINO_SDK_MIN_VERSION_NAME "${ARDUINO_SDK_MIN_VERSION_NAME}" +#include "arduinoversion.h" class QFile;