Skip to content
Snippets Groups Projects
Commit 320850d7 authored by barthgr's avatar barthgr
Browse files

add baic files

parent 2aaa7489
No related branches found
No related tags found
No related merge requests found
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe --tags --abbrev=0" OUTPUT_VARIABLE GIT_TAG) exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe --abbrev=0 --tags" OUTPUT_VARIABLE GIT_TAG)
cmake_policy (SET CMP0020 NEW) cmake_policy (SET CMP0020 NEW)
message("Git tag: " ${GIT_TAG})
project(RF_behavior_loader project(RF_behavior_loader
VERSION ${GIT_TAG} VERSION ${GIT_TAG}
LANGUAGES CXX) LANGUAGES CXX)
...@@ -17,8 +18,8 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} CACHE STRING ...@@ -17,8 +18,8 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} CACHE STRING
set(TN RF_behavior_loader) set(TN RF_behavior_loader)
add_library(${TN} STATIC) add_library(${TN} STATIC)
set_target_properties(${TN} PROPERTIES OUTPUT_NAME RF_behavior_loader) set_target_properties(${TN} PROPERTIES OUTPUT_NAME rf_utility)
include(SrcUtility/CMakeLists.txt) include(SrcBehaviorLoader/CMakeLists.txt)
install( install(
TARGETS TARGETS
...@@ -68,7 +69,6 @@ install( ...@@ -68,7 +69,6 @@ install(
install( install(
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/cmake/BehaviourPlugin.cmake
${CMAKE_CURRENT_SOURCE_DIR}/cmake/VSSugar.cmake ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VSSugar.cmake
DESTINATION ${INSTALL_CONFIGDIR}/Modules/${PROJECT_NAME} DESTINATION ${INSTALL_CONFIGDIR}/Modules/${PROJECT_NAME}
) )
......
...@@ -7,6 +7,7 @@ PluginLoader::PluginLoader(QObject *parent) ...@@ -7,6 +7,7 @@ PluginLoader::PluginLoader(QObject *parent)
m_PluginLoader = new QPluginLoader(this); m_PluginLoader = new QPluginLoader(this);
} }
/*---------------------------------------*/
bool PluginLoader::loadPluginFromFilename(QString const& filename) bool PluginLoader::loadPluginFromFilename(QString const& filename)
{ {
bool retval = false; bool retval = false;
...@@ -27,7 +28,7 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename) ...@@ -27,7 +28,7 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
QString s = m_PluginLoader->errorString(); QString s = m_PluginLoader->errorString();
std::string ss = s.toStdString(); std::string ss = s.toStdString();
if (!m_PluginLoader->isLoaded()) if (!m_PluginLoader->isLoaded())
{ {
qWarning() << ss.c_str(); qWarning() << ss.c_str();
} }
...@@ -39,16 +40,19 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename) ...@@ -39,16 +40,19 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
return retval; return retval;
} }
/*---------------------------------------*/
IBehaviourFactory* PluginLoader::getPluginInstance() IBehaviourFactory* PluginLoader::getPluginInstance()
{ {
return qobject_cast<IBehaviourFactory*>(m_PluginLoader->instance()); return qobject_cast<IBehaviourFactory*>(m_PluginLoader->instance());
} }
/*---------------------------------------*/
QJsonObject PluginLoader::getPluginMetaData() const QJsonObject PluginLoader::getPluginMetaData() const
{ {
return m_MetaData; return m_MetaData;
} }
/*---------------------------------------*/
void PluginLoader::readMetaDataFromPlugin() void PluginLoader::readMetaDataFromPlugin()
{ {
m_MetaData = m_PluginLoader->metaData().value("MetaData").toObject(); m_MetaData = m_PluginLoader->metaData().value("MetaData").toObject();
......
#ifndef PLUGINLOADER_H #ifndef PLUGINLOADER_H
#define PLUGINLOADER_H #define PLUGINLOADER_H
...@@ -8,7 +7,7 @@ ...@@ -8,7 +7,7 @@
#include "QPointer" #include "QPointer"
class PluginLoader : QObject class PluginLoader : QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit PluginLoader(QObject *parent = 0); explicit PluginLoader(QObject *parent = 0);
...@@ -24,4 +23,4 @@ private: ...@@ -24,4 +23,4 @@ private:
QJsonObject m_MetaData; QJsonObject m_MetaData;
}; };
#endif // PLUGINLOADER_H #endif // PLUGINLOADER_H
\ No newline at end of file
@PACKAGE_INIT@
find_package(RF_Interfaces 0.1.0 REQUIRED)
include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules")
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment