From 320850d7c76b360127c28615cda4f0d1b61385bb Mon Sep 17 00:00:00 2001
From: barthgr <barthgr@mi.fu-berlin.de>
Date: Wed, 26 Sep 2018 18:11:22 +0200
Subject: [PATCH] add baic files
---
CMakeLists.txt | 8 ++++----
SrcBehaviorLoader/PluginLoader.cpp | 6 +++++-
SrcBehaviorLoader/PluginLoader.h | 5 ++---
cmake/RF_behavior_loaderConfig.cmake.in | 7 +++++++
{CMake => cmake}/VSSugar.cmake | 0
5 files changed, 18 insertions(+), 8 deletions(-)
create mode 100644 cmake/RF_behavior_loaderConfig.cmake.in
rename {CMake => cmake}/VSSugar.cmake (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 599a0da..64d8b5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,10 @@
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)
+message("Git tag: " ${GIT_TAG})
project(RF_behavior_loader
VERSION ${GIT_TAG}
LANGUAGES CXX)
@@ -17,8 +18,8 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} CACHE STRING
set(TN RF_behavior_loader)
add_library(${TN} STATIC)
-set_target_properties(${TN} PROPERTIES OUTPUT_NAME RF_behavior_loader)
-include(SrcUtility/CMakeLists.txt)
+set_target_properties(${TN} PROPERTIES OUTPUT_NAME rf_utility)
+include(SrcBehaviorLoader/CMakeLists.txt)
install(
TARGETS
@@ -68,7 +69,6 @@ install(
install(
FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/BehaviourPlugin.cmake
${CMAKE_CURRENT_SOURCE_DIR}/cmake/VSSugar.cmake
DESTINATION ${INSTALL_CONFIGDIR}/Modules/${PROJECT_NAME}
)
diff --git a/SrcBehaviorLoader/PluginLoader.cpp b/SrcBehaviorLoader/PluginLoader.cpp
index 08c47c9..ca4aa39 100644
--- a/SrcBehaviorLoader/PluginLoader.cpp
+++ b/SrcBehaviorLoader/PluginLoader.cpp
@@ -7,6 +7,7 @@ PluginLoader::PluginLoader(QObject *parent)
m_PluginLoader = new QPluginLoader(this);
}
+/*---------------------------------------*/
bool PluginLoader::loadPluginFromFilename(QString const& filename)
{
bool retval = false;
@@ -27,7 +28,7 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
QString s = m_PluginLoader->errorString();
std::string ss = s.toStdString();
- if (!m_PluginLoader->isLoaded())
+ if (!m_PluginLoader->isLoaded())
{
qWarning() << ss.c_str();
}
@@ -39,16 +40,19 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
return retval;
}
+/*---------------------------------------*/
IBehaviourFactory* PluginLoader::getPluginInstance()
{
return qobject_cast<IBehaviourFactory*>(m_PluginLoader->instance());
}
+/*---------------------------------------*/
QJsonObject PluginLoader::getPluginMetaData() const
{
return m_MetaData;
}
+/*---------------------------------------*/
void PluginLoader::readMetaDataFromPlugin()
{
m_MetaData = m_PluginLoader->metaData().value("MetaData").toObject();
diff --git a/SrcBehaviorLoader/PluginLoader.h b/SrcBehaviorLoader/PluginLoader.h
index 5e9ae9b..8f23006 100644
--- a/SrcBehaviorLoader/PluginLoader.h
+++ b/SrcBehaviorLoader/PluginLoader.h
@@ -1,4 +1,3 @@
-
#ifndef PLUGINLOADER_H
#define PLUGINLOADER_H
@@ -8,7 +7,7 @@
#include "QPointer"
class PluginLoader : QObject
-{
+{
Q_OBJECT
public:
explicit PluginLoader(QObject *parent = 0);
@@ -24,4 +23,4 @@ private:
QJsonObject m_MetaData;
};
-#endif // PLUGINLOADER_H
\ No newline at end of file
+#endif // PLUGINLOADER_H
diff --git a/cmake/RF_behavior_loaderConfig.cmake.in b/cmake/RF_behavior_loaderConfig.cmake.in
new file mode 100644
index 0000000..f5d43d2
--- /dev/null
+++ b/cmake/RF_behavior_loaderConfig.cmake.in
@@ -0,0 +1,7 @@
+@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")
diff --git a/CMake/VSSugar.cmake b/cmake/VSSugar.cmake
similarity index 100%
rename from CMake/VSSugar.cmake
rename to cmake/VSSugar.cmake
--
GitLab