From e2dc33d2065f2177ff75d4c08fee859306e44639 Mon Sep 17 00:00:00 2001 From: Robin Caloudis Date: Wed, 29 Sep 2021 14:26:18 +0200 Subject: [PATCH 1/3] mod(gui): Unify logic and reduce coupling in cmake source files Signed-off-by: Robin Caloudis --- gui/CMakeLists.txt | 1 + gui/application/CMakeLists.txt | 34 +++--- gui/application/Interfaces/CMakeLists.txt | 18 --- .../Interfaces/openPASS/CMakeLists.txt | 18 --- gui/application/Models/CMakeLists.txt | 4 +- gui/common/CMakeLists.txt | 100 +++++++++++++++++ gui/plugins/component/CMakeLists.txt | 46 ++++---- .../component/Interfaces/CMakeLists.txt | 17 --- .../openPASS-Component/CMakeLists.txt | 24 ---- gui/plugins/component/Models/CMakeLists.txt | 8 +- gui/plugins/pcmEvaluation/CMakeLists.txt | 49 ++++----- .../pcmEvaluation/Interfaces/CMakeLists.txt | 15 --- .../pcmEvaluation/Models/CMakeLists.txt | 42 ++----- .../pcmEvaluation/Presenters/CMakeLists.txt | 7 +- .../pcmEvaluation/Views/CMakeLists.txt | 23 ++-- gui/plugins/pcmSimulation/CMakeLists.txt | 66 +++++++---- .../pcmSimulation/Interfaces/CMakeLists.txt | 15 --- .../pcmSimulation/Models/CMakeLists.txt | 48 ++------ .../ConfigurationGeneratorPcm/CMakeLists.txt | 45 ++++---- .../DataStructuresXml/CMakeLists.txt | 82 +++++++------- .../DataStructuresXosc/CMakeLists.txt | 2 +- .../pcmSimulation/Presenters/CMakeLists.txt | 5 +- .../pcmSimulation/Views/CMakeLists.txt | 12 +- gui/plugins/project/CMakeLists.txt | 42 +++---- gui/plugins/project/Interfaces/CMakeLists.txt | 18 --- .../openPASS-Project/CMakeLists.txt | 13 --- gui/plugins/project/Models/CMakeLists.txt | 5 +- gui/plugins/project/Presenters/CMakeLists.txt | 5 +- gui/plugins/project/Views/CMakeLists.txt | 6 +- gui/plugins/statistics/CMakeLists.txt | 41 +++---- .../statistics/Interfaces/CMakeLists.txt | 15 --- gui/plugins/statistics/Models/CMakeLists.txt | 7 +- .../statistics/Presenters/CMakeLists.txt | 5 +- gui/plugins/statistics/Views/CMakeLists.txt | 34 ++---- gui/plugins/system/CMakeLists.txt | 56 ++++++---- gui/plugins/system/Interfaces/CMakeLists.txt | 18 --- .../Interfaces/openPASS-System/CMakeLists.txt | 27 ----- gui/plugins/system/Models/CMakeLists.txt | 40 +++---- gui/plugins/system/Views/CMakeLists.txt | 104 +++++++++--------- gui/plugins/timePlot/CMakeLists.txt | 42 +++---- .../timePlot/Interfaces/CMakeLists.txt | 15 --- gui/plugins/timePlot/Models/CMakeLists.txt | 17 +-- .../timePlot/Presenters/CMakeLists.txt | 7 +- gui/plugins/timePlot/Views/CMakeLists.txt | 26 ++--- gui/plugins/window/CMakeLists.txt | 45 ++++---- gui/plugins/window/Interfaces/CMakeLists.txt | 19 ---- .../Interfaces/openPASS-Window/CMakeLists.txt | 13 --- gui/plugins/window/Models/CMakeLists.txt | 5 +- gui/plugins/window/Presenters/CMakeLists.txt | 5 +- gui/plugins/window/Views/CMakeLists.txt | 6 +- 50 files changed, 541 insertions(+), 776 deletions(-) delete mode 100644 gui/application/Interfaces/CMakeLists.txt delete mode 100644 gui/application/Interfaces/openPASS/CMakeLists.txt delete mode 100644 gui/plugins/component/Interfaces/CMakeLists.txt delete mode 100644 gui/plugins/component/Interfaces/openPASS-Component/CMakeLists.txt delete mode 100644 gui/plugins/pcmEvaluation/Interfaces/CMakeLists.txt delete mode 100644 gui/plugins/pcmSimulation/Interfaces/CMakeLists.txt delete mode 100644 gui/plugins/project/Interfaces/CMakeLists.txt delete mode 100644 gui/plugins/project/Interfaces/openPASS-Project/CMakeLists.txt delete mode 100644 gui/plugins/statistics/Interfaces/CMakeLists.txt delete mode 100644 gui/plugins/system/Interfaces/CMakeLists.txt delete mode 100644 gui/plugins/system/Interfaces/openPASS-System/CMakeLists.txt delete mode 100644 gui/plugins/timePlot/Interfaces/CMakeLists.txt delete mode 100644 gui/plugins/window/Interfaces/CMakeLists.txt delete mode 100644 gui/plugins/window/Interfaces/openPASS-Window/CMakeLists.txt diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index b4de61c3..540a3216 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -15,6 +15,7 @@ cmake_minimum_required(VERSION 3.14) set(CMAKE_POSITION_INDEPENDENT_CODE ON) add_subdirectory(application) +add_subdirectory(common) #add_subdirectory(plugins/agentConfiguration) add_subdirectory(plugins/component) add_subdirectory(plugins/pcmEvaluation) diff --git a/gui/application/CMakeLists.txt b/gui/application/CMakeLists.txt index 5d783fd7..981e7968 100644 --- a/gui/application/CMakeLists.txt +++ b/gui/application/CMakeLists.txt @@ -31,22 +31,26 @@ include_directories(Interfaces) include_directories(${Qt5Widgets_INCLUDE_DIRS}) # include interfaces, models and views -add_subdirectory(Interfaces) add_subdirectory(Models) -# include sources and headers -set(SOURCES openPASS.cpp) set(RC_ICONS openPASS.rc) - -# declare target library -add_executable(openPASS WIN32 ${SOURCES} ${RC_ICONS}) - -# link with Qt libraries, models, views and Interfaces -target_link_libraries(openPASS PRIVATE - Qt5::Widgets - ${PROJECT_NAME}_Models - ${PROJECT_NAME}_Interfaces) - -install(TARGETS openPASS - RUNTIME DESTINATION ${INSTALL_BIN_DIR}) +add_openpass_target( + NAME openPASS TYPE executable COMPONENT gui + + HEADERS + Interfaces/openPASS/PluginInterface.h + Interfaces/openPASS/PluginManagerInterface.h + Interfaces/openPASS/RandomInterface.h + Interfaces/openPASS/ServiceInterface.h + Interfaces/openPASS/ServiceManagerInterface.h + Interfaces/openPASS/ioplugininterface.h + + SOURCES + openPASS.cpp + ${RC_ICONS} + + LIBRARIES + Qt5::Widgets + ${PROJECT_NAME}_Models +) \ No newline at end of file diff --git a/gui/application/Interfaces/CMakeLists.txt b/gui/application/Interfaces/CMakeLists.txt deleted file mode 100644 index 98ff5baf..00000000 --- a/gui/application/Interfaces/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -# define headers variable -set(HEADERS "") - -# include all interface headers -include(openPASS/CMakeLists.txt) - -# build interface libraries -add_library(${PROJECT_NAME}_Interfaces STATIC ${HEADERS}) diff --git a/gui/application/Interfaces/openPASS/CMakeLists.txt b/gui/application/Interfaces/openPASS/CMakeLists.txt deleted file mode 100644 index ec81fc19..00000000 --- a/gui/application/Interfaces/openPASS/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -set(HEADERS - ${HEADERS} - ${CMAKE_CURRENT_LIST_DIR}/PluginInterface.h - ${CMAKE_CURRENT_LIST_DIR}/PluginManagerInterface.h - ${CMAKE_CURRENT_LIST_DIR}/RandomInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ServiceInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ServiceManagerInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ioplugininterface.h) diff --git a/gui/application/Models/CMakeLists.txt b/gui/application/Models/CMakeLists.txt index 827fb304..f4d579e3 100644 --- a/gui/application/Models/CMakeLists.txt +++ b/gui/application/Models/CMakeLists.txt @@ -11,12 +11,12 @@ set(SOURCES PluginManagerModel.cpp ServiceManagerModel.cpp - ) +) set(HEADERS PluginManagerModel.h ServiceManagerModel.h - ) +) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) diff --git a/gui/common/CMakeLists.txt b/gui/common/CMakeLists.txt index eccb9cc6..8a37daa3 100644 --- a/gui/common/CMakeLists.txt +++ b/gui/common/CMakeLists.txt @@ -7,3 +7,103 @@ # * # * SPDX-License-Identifier: EPL-2.0 # **********************************************************************/ + +find_package(Qt5 COMPONENTS Core Widgets Xml Sql REQUIRED) + +set(SOURCES + pcm/PCM_Data/pcm_agent.cpp + pcm/PCM_Data/pcm_line.cpp + pcm/PCM_Data/pcm_marks.cpp + pcm/PCM_Data/pcm_point.cpp + pcm/PCM_Data/pcm_trajectory.cpp + pcm/PCM_Data/pcm_globalData.cpp + pcm/PCM_Data/pcm_course.cpp + pcm/PCM_Data/pcm_lineContainer.cpp + pcm/PCM_Data/pcm_object.cpp + pcm/PCM_Data/pcm_pointContainer.cpp + pcm/PCM_Data/pcm_viewObject.cpp + pcm/PCM_Data/pcm_data.cpp + pcm/PCM_Data/pcm_initialValues.cpp + pcm/PCM_Data/pcm_lineSegment.cpp + pcm/PCM_Data/pcm_participantData.cpp + pcm/PCM_Data/pcm_simulationSet.cpp + + pcm/PCM_Importer/scenarioImporterPCM.cpp + pcm/PCM_Importer/sceneryImporterPCM.cpp + pcm/PCM_Importer/vehicleModelImporter.cpp + + DelegateDoubleView.cpp + Plot.cpp + WidgetView.cpp + CenteredTextItem.cpp + Graph.cpp + RowHistograms.cpp + DelegateTimeView.cpp + PlotAxes.cpp + DelegateComboBoxView.cpp + Histogram.cpp + TableModel.cpp + PlotGraphicsItem.cpp +) + +set(HEADERS + pcm/DataStructuresBase/XmlBaseClass.h + pcm/DataStructuresBase/XmlBaseTypes.h + + pcm/PCM_Data/pcm_definitions.h + pcm/PCM_Data/pcm_agent.h + pcm/PCM_Data/pcm_line.h + pcm/PCM_Data/pcm_marks.h + pcm/PCM_Data/pcm_point.h + pcm/PCM_Data/pcm_trajectory.h + pcm/PCM_Data/pcm_course.cpp + pcm/PCM_Data/pcm_globalData.h + pcm/PCM_Data/pcm_course.h + pcm/PCM_Data/pcm_helper.h + pcm/PCM_Data/pcm_lineContainer.h + pcm/PCM_Data/pcm_object.h + pcm/PCM_Data/pcm_pointContainer.h + pcm/PCM_Data/pcm_viewObject.h + pcm/PCM_Data/pcm_data.h + pcm/PCM_Data/pcm_initialValues.h + pcm/PCM_Data/pcm_lineSegment.h + pcm/PCM_Data/pcm_participantData.h + pcm/PCM_Data/pcm_simulationSet.h + + pcm/PCM_Importer/scenarioImporterPCM.h + pcm/PCM_Importer/sceneryImporterPCM.h + pcm/PCM_Importer/vehicleModelImporter.h + + GUI_Definitions.h + PlotGraphicsItem.h + DelegateDoubleView.h + Plot.h + WidgetView.h + CenteredTextItem.h + Graph.h + RowHistograms.h + DelegateTimeView.h + PlotAxes.h + DelegateComboBoxView.h + EditDataCommand.h + Histogram.h + TableModel.h +) + +include_directories(../../sim/src/common) +include_directories(../../sim/src) +include_directories(${Qt5Widgets_INCLUDE_DIRS}) +include_directories(${Qt5Xml_INCLUDE_DIRS}) +include_directories(${Qt5Sql_INCLUDE_DIRS}) +include_directories(pcm/DataStructuresBase) +include_directories(pcm/PCM_Data) +include_directories(pcm/PCM_Importer) + +add_library(Common_lib STATIC ${SOURCES} ${HEADERS}) + +target_link_libraries(Common_lib PRIVATE + Qt5::Widgets + Qt5::Core + Qt5::Xml + Qt5::Sql +) \ No newline at end of file diff --git a/gui/plugins/component/CMakeLists.txt b/gui/plugins/component/CMakeLists.txt index da8d518b..0430198f 100644 --- a/gui/plugins/component/CMakeLists.txt +++ b/gui/plugins/component/CMakeLists.txt @@ -27,26 +27,30 @@ include_directories(../../application/Interfaces) include_directories(${Qt5Widgets_INCLUDE_DIRS}) # include interfaces, models and views -add_subdirectory(Interfaces) add_subdirectory(Models) -# include sources and headers -set(SOURCES ComponentPlugin.cpp) -set(HEADERS ComponentPlugin.h) - -# declare target library -add_library(Component SHARED ${SOURCES} ${HEADERS}) - -# link with Qt libraries, models, views and Interfaces -target_link_libraries(Component PRIVATE - Qt5::Widgets - ${PROJECT_NAME}_Models - ${PROJECT_NAME}_Interfaces) - -if(WIN32) - install(TARGETS Component - RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) -elseif(UNIX) - install(TARGETS Component - LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) -endif() +add_openpass_target( + NAME Component TYPE library LINKAGE shared COMPONENT gui + + HEADERS + Interfaces/openPASS-Component/ComponentInputItemInterface.h + Interfaces/openPASS-Component/ComponentInputMapInterface.h + Interfaces/openPASS-Component/ComponentInterface.h + Interfaces/openPASS-Component/ComponentItemInterface.h + Interfaces/openPASS-Component/ComponentMapInterface.h + Interfaces/openPASS-Component/ComponentOutputItemInterface.h + Interfaces/openPASS-Component/ComponentOutputMapInterface.h + Interfaces/openPASS-Component/ComponentParameterItemInterface.h + Interfaces/openPASS-Component/ComponentParameterMapInterface.h + Interfaces/openPASS-Component/ComponentScheduleInterface.h + Interfaces/openPASS-Component/ComponentTypedefItemInterface.h + Interfaces/openPASS-Component/ComponentTypedefMapInterface.h + ComponentPlugin.h + + SOURCES + ComponentPlugin.cpp + + LIBRARIES + Qt5::Widgets + ${PROJECT_NAME}_Models +) \ No newline at end of file diff --git a/gui/plugins/component/Interfaces/CMakeLists.txt b/gui/plugins/component/Interfaces/CMakeLists.txt deleted file mode 100644 index c3ec3de4..00000000 --- a/gui/plugins/component/Interfaces/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -set(HEADERS "") - -# build all Interface libraries -include(openPASS-Component/CMakeLists.txt) - -# bundle all libraries to one interface library -add_library(${PROJECT_NAME}_Interfaces STATIC ${HEADERS}) diff --git a/gui/plugins/component/Interfaces/openPASS-Component/CMakeLists.txt b/gui/plugins/component/Interfaces/openPASS-Component/CMakeLists.txt deleted file mode 100644 index 3646040c..00000000 --- a/gui/plugins/component/Interfaces/openPASS-Component/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -set(HEADERS - ${HEADERS} - ${CMAKE_CURRENT_LIST_DIR}/ComponentInputItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentInputMapInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentMapInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentOutputItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentOutputMapInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentParameterItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentParameterMapInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentScheduleInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentTypedefItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/ComponentTypedefMapInterface.h) diff --git a/gui/plugins/component/Models/CMakeLists.txt b/gui/plugins/component/Models/CMakeLists.txt index f803c89e..4fd8d600 100644 --- a/gui/plugins/component/Models/CMakeLists.txt +++ b/gui/plugins/component/Models/CMakeLists.txt @@ -24,8 +24,7 @@ set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/ComponentXMLSaveModel.cpp ${CMAKE_CURRENT_LIST_DIR}/ComponentTypedefMapModel.cpp ${CMAKE_CURRENT_LIST_DIR}/ComponentTypedefItemModel.cpp - - ) +) set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/ComponentInputItemModel.h @@ -43,7 +42,6 @@ set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/ComponentXMLSaveModel.h ${CMAKE_CURRENT_LIST_DIR}/ComponentTypedefMapModel.h ${CMAKE_CURRENT_LIST_DIR}/ComponentTypedefItemModel.h - ) +) -add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) +add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) \ No newline at end of file diff --git a/gui/plugins/pcmEvaluation/CMakeLists.txt b/gui/plugins/pcmEvaluation/CMakeLists.txt index 86632dbb..33eb2e73 100644 --- a/gui/plugins/pcmEvaluation/CMakeLists.txt +++ b/gui/plugins/pcmEvaluation/CMakeLists.txt @@ -21,7 +21,6 @@ find_package(Qt5 COMPONENTS Core Widgets Xml REQUIRED) # set include directories include_directories(.) -include_directories(Interfaces) include_directories(Models) include_directories(Presenters) include_directories(Views) @@ -36,36 +35,26 @@ include_directories(${Qt5Widgets_INCLUDE_DIRS}) include_directories(${Qt5Xml_INCLUDE_DIRS}) # include interfaces, models and views -add_subdirectory(Interfaces) add_subdirectory(Models) add_subdirectory(Presenters) add_subdirectory(Views) -# include headers and sources of this plugin -set(SOURCES PluginPcm_Eval.cpp) -set(HEADERS PluginPcm_Eval.h) - -# declare target library -add_library(Pcm_eval SHARED ${SOURCES} ${HEADERS} ) - -# include directory of lib 'window' -link_directories(${openPASS-Window_SOURCE_DIR}) - -# link with Qt libraries, models, views and Interfaces -target_link_libraries(Pcm_eval PRIVATE - Qt5::Widgets - Qt5::Core - Qt5::Xml - Window - ${PROJECT_NAME}_Models - ${PROJECT_NAME}_Views - ${PROJECT_NAME}_Interfaces - ${PROJECT_NAME}_Presenters) - -if(WIN32) - install(TARGETS Pcm_eval - RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) -elseif(UNIX) - install(TARGETS Pcm_eval - LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) -endif() +add_openpass_target( + NAME Pcm_eval TYPE library LINKAGE shared COMPONENT gui + + HEADERS + Interfaces/openPASS-PCM_Eval/PCM_Eval_Interface.h + PluginPcm_Eval.h + + SOURCES + PluginPcm_Eval.cpp + + LIBRARIES + Qt5::Widgets + Qt5::Core + Qt5::Xml + Window + ${PROJECT_NAME}_Models + ${PROJECT_NAME}_Views + ${PROJECT_NAME}_Presenters +) \ No newline at end of file diff --git a/gui/plugins/pcmEvaluation/Interfaces/CMakeLists.txt b/gui/plugins/pcmEvaluation/Interfaces/CMakeLists.txt deleted file mode 100644 index 8081434b..00000000 --- a/gui/plugins/pcmEvaluation/Interfaces/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2020, 2021 ITK Engineering GmbH -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -# define headers variable -set(HEADERS "") - -# bundle all libraries to one interface library -add_library(${PROJECT_NAME}_Interfaces STATIC ${HEADERS}) diff --git a/gui/plugins/pcmEvaluation/Models/CMakeLists.txt b/gui/plugins/pcmEvaluation/Models/CMakeLists.txt index ddb41a5f..49b2b48f 100644 --- a/gui/plugins/pcmEvaluation/Models/CMakeLists.txt +++ b/gui/plugins/pcmEvaluation/Models/CMakeLists.txt @@ -9,40 +9,16 @@ # **********************************************************************/ set(SOURCES - ModelPcm_Eval.cpp - ResultDirItemModel.cpp - TrajectoryTableModel.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Importer/sceneryImporterPCM.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_agent.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_course.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_data.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_globalData.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_line.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_lineContainer.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_marks.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_object.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_point.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_pointContainer.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_trajectory.cpp - ) + ModelPcm_Eval.cpp + ResultDirItemModel.cpp + TrajectoryTableModel.cpp +) set(HEADERS - ModelPcm_Eval.h - ResultDirItemModel.h - TrajectoryTableModel.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Importer/sceneryImporterPCM.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_agent.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_course.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_data.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_globalData.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_line.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_lineContainer.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_marks.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_object.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_point.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_pointContainer.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_trajectory.h - ) + ModelPcm_Eval.h + ResultDirItemModel.h + TrajectoryTableModel.h +) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Xml) +target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Xml Common_lib) \ No newline at end of file diff --git a/gui/plugins/pcmEvaluation/Presenters/CMakeLists.txt b/gui/plugins/pcmEvaluation/Presenters/CMakeLists.txt index e2496ef7..86957f2f 100644 --- a/gui/plugins/pcmEvaluation/Presenters/CMakeLists.txt +++ b/gui/plugins/pcmEvaluation/Presenters/CMakeLists.txt @@ -10,11 +10,10 @@ set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/PresenterPcm_Eval.h - ) +) set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/PresenterPcm_Eval.cpp - ) +) - -add_library(${PROJECT_NAME}_Presenters STATIC ${SOURCES} ${HEADERS}) +add_library(${PROJECT_NAME}_Presenters STATIC ${SOURCES} ${HEADERS}) \ No newline at end of file diff --git a/gui/plugins/pcmEvaluation/Views/CMakeLists.txt b/gui/plugins/pcmEvaluation/Views/CMakeLists.txt index f5f2a0af..104b970e 100644 --- a/gui/plugins/pcmEvaluation/Views/CMakeLists.txt +++ b/gui/plugins/pcmEvaluation/Views/CMakeLists.txt @@ -9,20 +9,19 @@ # **********************************************************************/ set(SOURCES - ViewPcm_Eval.cpp - TrajectoryGraphicsItem.cpp - TrafficScene.cpp - ) + ViewPcm_Eval.cpp + TrajectoryGraphicsItem.cpp + TrafficScene.cpp +) set(HEADERS - ViewPcm_Eval.h - TrajectoryGraphicsItem.h - TrafficScene.h - ) + ViewPcm_Eval.h + TrajectoryGraphicsItem.h + TrafficScene.h +) set(UI - ViewPcm_Eval.ui - ) + ViewPcm_Eval.ui +) -add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) +add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) \ No newline at end of file diff --git a/gui/plugins/pcmSimulation/CMakeLists.txt b/gui/plugins/pcmSimulation/CMakeLists.txt index 04c5b6a6..0a2c4726 100644 --- a/gui/plugins/pcmSimulation/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/CMakeLists.txt @@ -38,34 +38,56 @@ include_directories(${Qt5Xml_INCLUDE_DIRS}) include_directories(${Qt5Sql_INCLUDE_DIRS}) # include interfaces, models and views -add_subdirectory(Interfaces) +# add_subdirectory(Interfaces) add_subdirectory(Models) add_subdirectory(Presenters) add_subdirectory(Views) # include headers and sources of this plugin -set(SOURCES PluginPcm.cpp) -set(HEADERS PluginPcm.h) +# set(SOURCES +# PluginPcm.cpp) + +# set(HEADERS +# Interfaces/openPASS-PCM/PCMInterface.h +# PluginPcm.h) # declare target library -add_library(Pcm_sim SHARED ${SOURCES} ${HEADERS} ) +# add_library(Pcm_sim SHARED ${SOURCES} ${HEADERS} ) -# link with Qt libraries, models, views and Interfaces -target_link_libraries(Pcm_sim PRIVATE - Qt5::Widgets - Qt5::Core - Qt5::Xml - Qt5::Sql - Window - ${PROJECT_NAME}_Models - ${PROJECT_NAME}_Views - ${PROJECT_NAME}_Interfaces - ${PROJECT_NAME}_Presenters) +# # link with Qt libraries, models, views and Interfaces +# target_link_libraries(Pcm_sim PRIVATE +# # Qt5::Widgets +# # Qt5::Core +# # Qt5::Xml +# # Qt5::Sql +# Window +# ${PROJECT_NAME}_Models +# ${PROJECT_NAME}_Views +# #${PROJECT_NAME}_Interfaces +# ${PROJECT_NAME}_Presenters) -if(WIN32) - install(TARGETS Pcm_sim - RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) -elseif(UNIX) - install(TARGETS Pcm_sim - LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) -endif() \ No newline at end of file +# if(WIN32) +# install(TARGETS Pcm_sim +# RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) +# elseif(UNIX) +# install(TARGETS Pcm_sim +# LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) +# endif() + +add_openpass_target( + NAME Pcm_sim TYPE library LINKAGE shared COMPONENT gui + + HEADERS + Interfaces/openPASS-PCM/PCMInterface.h + PluginPcm.h + + SOURCES + PluginPcm.cpp + + LIBRARIES + Window + ${PROJECT_NAME}_Models + ${PROJECT_NAME}_Views + #${PROJECT_NAME}_Interfaces + ${PROJECT_NAME}_Presenters +) \ No newline at end of file diff --git a/gui/plugins/pcmSimulation/Interfaces/CMakeLists.txt b/gui/plugins/pcmSimulation/Interfaces/CMakeLists.txt deleted file mode 100644 index 62d32023..00000000 --- a/gui/plugins/pcmSimulation/Interfaces/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2021 ITK Engineering GmbH -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -# define headers variable -set(HEADERS "") - -# bundle all libraries to one interface library -add_library(${PROJECT_NAME}_Interfaces STATIC ${HEADERS}) diff --git a/gui/plugins/pcmSimulation/Models/CMakeLists.txt b/gui/plugins/pcmSimulation/Models/CMakeLists.txt index 6147fbce..55c0eecd 100644 --- a/gui/plugins/pcmSimulation/Models/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Models/CMakeLists.txt @@ -8,47 +8,17 @@ # * SPDX-License-Identifier: EPL-2.0 # **********************************************************************/ +add_subdirectory(ConfigurationGeneratorPcm) + set(SOURCES - ModelPcm.cpp - FileHelper.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Importer/sceneryImporterPCM.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_agent.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_course.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_data.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_globalData.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_initialValues.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_line.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_lineContainer.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_marks.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_object.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_participantData.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_point.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_pointContainer.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_simulationSet.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_trajectory.cpp - ) + ModelPcm.cpp + FileHelper.cpp +) set(HEADERS - ModelPcm.h - FileHelper.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Importer/sceneryImporterPCM.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_agent.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_course.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_data.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_globalData.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_initialValues.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_line.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_lineContainer.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_marks.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_object.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_participantData.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_point.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_pointContainer.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_simulationSet.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/pcm/PCM_Data/pcm_trajectory.h - ) + ModelPcm.h + FileHelper.h +) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Xml Qt5::Widgets Qt5::Sql) - -add_subdirectory(ConfigurationGeneratorPcm) +target_link_libraries(${PROJECT_NAME}_Models PRIVATE ConfigurationGeneratorPcm DataStructuresXosc DataStructuresXml) diff --git a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt index d8827c23..8c5c161d 100644 --- a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt @@ -8,31 +8,28 @@ # * SPDX-License-Identifier: EPL-2.0 # **********************************************************************/ +add_subdirectory(DataStructuresXml) +add_subdirectory(DataStructuresXosc) + set(SOURCES - XmlMergeHelper.cpp - stochasticsPCM.cpp - openScenarioWriter.cpp - DatabaseReaderPcm.cpp - ConfigWriter.cpp - ConfigSetReaderPcm.cpp - ConfigGeneratorPcm.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../../common/pcm/PCM_Importer/scenarioImporterPCM.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../../common/pcm/PCM_Importer/vehicleModelImporter.cpp - ) + XmlMergeHelper.cpp + stochasticsPCM.cpp + openScenarioWriter.cpp + DatabaseReaderPcm.cpp + ConfigWriter.cpp + ConfigSetReaderPcm.cpp + ConfigGeneratorPcm.cpp +) set(HEADERS - XmlMergeHelper.h - stochasticsPCM.h - openScenarioWriter.h - DatabaseReaderPcm.h - ConfigWriter.h - ConfigSetReaderPcm.h - ConfigGeneratorPcm.h - ${CMAKE_CURRENT_LIST_DIR}/../../../../common/pcm/PCM_Importer/scenarioImporterPCM.h - ${CMAKE_CURRENT_LIST_DIR}/../../../../common/pcm/PCM_Importer/vehicleModelImporter.h - ) + XmlMergeHelper.h + stochasticsPCM.h + openScenarioWriter.h + DatabaseReaderPcm.h + ConfigWriter.h + ConfigSetReaderPcm.h + ConfigGeneratorPcm.h +) -target_sources(${PROJECT_NAME}_Models PRIVATE ${SOURCES} ${HEADERS}) - -add_subdirectory(DataStructuresXml) -add_subdirectory(DataStructuresXosc) +add_library(ConfigurationGeneratorPcm STATIC ${SOURCES} ${HEADERS}) +target_link_libraries(ConfigurationGeneratorPcm Common_lib) diff --git a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXml/CMakeLists.txt b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXml/CMakeLists.txt index 0ca23e87..25d58090 100644 --- a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXml/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXml/CMakeLists.txt @@ -9,47 +9,47 @@ # **********************************************************************/ set(SOURCES - XmlAgent.cpp - XmlAgentEquipment.cpp - XmlComponent.cpp - XmlComponentObservation.cpp - XmlComponentSignal.cpp - XmlGlobalData.cpp - XmlLine.cpp - XmlMarks.cpp - XmlModelsConfig.cpp - XmlObject.cpp - XmlObservation.cpp - XmlParameter.cpp - XmlPoint.cpp - XmlProfilesConfig.cpp - XmlScenery.cpp - XmlSlaveConfig.cpp - XmlSpawnPoint.cpp - XmlTrajectory.cpp - XmlViewObject.cpp - ) + XmlAgent.cpp + XmlAgentEquipment.cpp + XmlComponent.cpp + XmlComponentObservation.cpp + XmlComponentSignal.cpp + XmlGlobalData.cpp + XmlLine.cpp + XmlMarks.cpp + XmlModelsConfig.cpp + XmlObject.cpp + XmlObservation.cpp + XmlParameter.cpp + XmlPoint.cpp + XmlProfilesConfig.cpp + XmlScenery.cpp + XmlSlaveConfig.cpp + XmlSpawnPoint.cpp + XmlTrajectory.cpp + XmlViewObject.cpp +) set(HEADERS - XmlAgent.h - XmlAgentEquipment.h - XmlComponent.h - XmlComponentObservation.h - XmlComponentSignal.h - XmlGlobalData.h - XmlLine.h - XmlMarks.h - XmlModelsConfig.h - XmlObject.h - XmlObservation.h - XmlParameter.h - XmlPoint.h - XmlProfilesConfig.h - XmlScenery.h - XmlSlaveConfig.h - XmlSpawnPoint.h - XmlTrajectory.h - XmlViewObject.h - ) + XmlAgent.h + XmlAgentEquipment.h + XmlComponent.h + XmlComponentObservation.h + XmlComponentSignal.h + XmlGlobalData.h + XmlLine.h + XmlMarks.h + XmlModelsConfig.h + XmlObject.h + XmlObservation.h + XmlParameter.h + XmlPoint.h + XmlProfilesConfig.h + XmlScenery.h + XmlSlaveConfig.h + XmlSpawnPoint.h + XmlTrajectory.h + XmlViewObject.h +) -target_sources(${PROJECT_NAME}_Models PRIVATE ${SOURCES} ${HEADERS}) +add_library(DataStructuresXml STATIC ${SOURCES} ${HEADERS}) diff --git a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXosc/CMakeLists.txt b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXosc/CMakeLists.txt index 1f59b553..7c6725f9 100644 --- a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXosc/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXosc/CMakeLists.txt @@ -18,4 +18,4 @@ set(HEADERS XoscTrajectory.h ) -target_sources(${PROJECT_NAME}_Models PRIVATE ${SOURCES} ${HEADERS}) +add_library(DataStructuresXosc STATIC ${SOURCES} ${HEADERS}) diff --git a/gui/plugins/pcmSimulation/Presenters/CMakeLists.txt b/gui/plugins/pcmSimulation/Presenters/CMakeLists.txt index 3b4c20e4..0132837b 100644 --- a/gui/plugins/pcmSimulation/Presenters/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Presenters/CMakeLists.txt @@ -10,11 +10,10 @@ set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/PresenterPcm.h - ) +) set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/PresenterPcm.cpp - ) - +) add_library(${PROJECT_NAME}_Presenters STATIC ${SOURCES} ${HEADERS}) diff --git a/gui/plugins/pcmSimulation/Views/CMakeLists.txt b/gui/plugins/pcmSimulation/Views/CMakeLists.txt index fd30aafc..211dd40b 100644 --- a/gui/plugins/pcmSimulation/Views/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Views/CMakeLists.txt @@ -9,16 +9,16 @@ # **********************************************************************/ set(SOURCES - ViewPcm.cpp - ) + ViewPcm.cpp +) set(HEADERS - ViewPcm.h - ) + ViewPcm.h +) set(UI - ViewPcm.ui - ) + ViewPcm.ui +) add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) diff --git a/gui/plugins/project/CMakeLists.txt b/gui/plugins/project/CMakeLists.txt index 0974f1b3..0ec46686 100644 --- a/gui/plugins/project/CMakeLists.txt +++ b/gui/plugins/project/CMakeLists.txt @@ -29,33 +29,25 @@ include_directories(../window/Interfaces) include_directories(../../application/Interfaces) include_directories(${Qt5Widgets_INCLUDE_DIRS}) - # include interfaces, models and views -add_subdirectory(Interfaces) add_subdirectory(Models) add_subdirectory(Presenters) add_subdirectory(Views) -# include headers and sources of this plugin -set(SOURCES ProjectPlugin.cpp) -set(HEADERS ProjectPlugin.h) - -# declare target library -add_library(Project SHARED ${SOURCES} ${HEADERS}) - -# link with Qt libraries, models, views and Interfaces -target_link_libraries(Project PRIVATE - Qt5::Widgets - Window - ${PROJECT_NAME}_Models - ${PROJECT_NAME}_Views - ${PROJECT_NAME}_Presenters - ${PROJECT_NAME}_Interfaces) - -if(WIN32) - install(TARGETS Project - RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) -elseif(UNIX) - install(TARGETS Project - LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) -endif() \ No newline at end of file +add_openpass_target( + NAME Project TYPE library LINKAGE shared COMPONENT gui + + HEADERS + Interfaces/openPASS-Project/ProjectInterface.h + ProjectPlugin.h + + SOURCES + ProjectPlugin.cpp + + LIBRARIES + Qt5::Widgets + Window + ${PROJECT_NAME}_Models + ${PROJECT_NAME}_Views + ${PROJECT_NAME}_Presenters +) \ No newline at end of file diff --git a/gui/plugins/project/Interfaces/CMakeLists.txt b/gui/plugins/project/Interfaces/CMakeLists.txt deleted file mode 100644 index 4a46d3b0..00000000 --- a/gui/plugins/project/Interfaces/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -# define headers variable -set(HEADERS "") - -# build all Interface libraries -include(openPASS-Project/CMakeLists.txt) - -# bundle all libraries to one interface library -add_library(${PROJECT_NAME}_Interfaces STATIC ${HEADERS}) diff --git a/gui/plugins/project/Interfaces/openPASS-Project/CMakeLists.txt b/gui/plugins/project/Interfaces/openPASS-Project/CMakeLists.txt deleted file mode 100644 index bd683c38..00000000 --- a/gui/plugins/project/Interfaces/openPASS-Project/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -set(HEADERS - ${HEADERS} - ${CMAKE_CURRENT_LIST_DIR}/ProjectInterface.h) diff --git a/gui/plugins/project/Models/CMakeLists.txt b/gui/plugins/project/Models/CMakeLists.txt index 26811d72..311a8883 100644 --- a/gui/plugins/project/Models/CMakeLists.txt +++ b/gui/plugins/project/Models/CMakeLists.txt @@ -13,14 +13,13 @@ set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/ProjectXMLBaseModel.cpp ${CMAKE_CURRENT_LIST_DIR}/ProjectXMLSaveModel.cpp ${CMAKE_CURRENT_LIST_DIR}/ProjectXMLLoadModel.cpp - - ) +) set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/ProjectModel.h ${CMAKE_CURRENT_LIST_DIR}/ProjectXMLBaseModel.h ${CMAKE_CURRENT_LIST_DIR}/ProjectXMLSaveModel.h ${CMAKE_CURRENT_LIST_DIR}/ProjectXMLLoadModel.h - ) +) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) diff --git a/gui/plugins/project/Presenters/CMakeLists.txt b/gui/plugins/project/Presenters/CMakeLists.txt index 01717dc4..9a019569 100644 --- a/gui/plugins/project/Presenters/CMakeLists.txt +++ b/gui/plugins/project/Presenters/CMakeLists.txt @@ -10,11 +10,10 @@ set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/ProjectPresenter.h - ) +) set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/ProjectPresenter.cpp - ) - +) add_library(${PROJECT_NAME}_Presenters STATIC ${SOURCES} ${HEADERS}) diff --git a/gui/plugins/project/Views/CMakeLists.txt b/gui/plugins/project/Views/CMakeLists.txt index d3ae6927..2c68e22e 100644 --- a/gui/plugins/project/Views/CMakeLists.txt +++ b/gui/plugins/project/Views/CMakeLists.txt @@ -10,15 +10,15 @@ set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/ProjectView.cpp - ) +) set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/ProjectView.h - ) +) set(UI ${CMAKE_CURRENT_LIST_DIR}/ProjectView.ui - ) +) add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) diff --git a/gui/plugins/statistics/CMakeLists.txt b/gui/plugins/statistics/CMakeLists.txt index 065a0c18..bff42967 100644 --- a/gui/plugins/statistics/CMakeLists.txt +++ b/gui/plugins/statistics/CMakeLists.txt @@ -31,31 +31,24 @@ include_directories(../../common) include_directories(${Qt5Widgets_INCLUDE_DIRS}) # include interfaces, models and views -add_subdirectory(Interfaces) add_subdirectory(Models) add_subdirectory(Presenters) add_subdirectory(Views) -# include headers and sources of this plugin -set(SOURCES PluginStatistics.cpp) -set(HEADERS PluginStatistics.h) - -# declare target library -add_library(Statistics SHARED ${SOURCES} ${HEADERS} ) - -# link with Qt libraries, models, views and Interfaces -target_link_libraries(Statistics PRIVATE - Qt5::Widgets - Window - ${PROJECT_NAME}_Models - ${PROJECT_NAME}_Views - ${PROJECT_NAME}_Interfaces - ${PROJECT_NAME}_Presenters) - -if(WIN32) - install(TARGETS Statistics - RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) -elseif(UNIX) - install(TARGETS Statistics - LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) -endif() +add_openpass_target( + NAME Statistics TYPE library LINKAGE shared COMPONENT gui + + HEADERS + PluginStatistics.h + + SOURCES + PluginStatistics.cpp + + LIBRARIES + Qt5::Widgets + Window + ${PROJECT_NAME}_Models + ${PROJECT_NAME}_Views + #${PROJECT_NAME}_Interfaces + ${PROJECT_NAME}_Presenters +) diff --git a/gui/plugins/statistics/Interfaces/CMakeLists.txt b/gui/plugins/statistics/Interfaces/CMakeLists.txt deleted file mode 100644 index 10e7969c..00000000 --- a/gui/plugins/statistics/Interfaces/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2020 ITK Engineering GmbH -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -# define headers variable -set(HEADERS "") - -# bundle all libraries to one interface library -add_library(${PROJECT_NAME}_Interfaces STATIC ${HEADERS}) diff --git a/gui/plugins/statistics/Models/CMakeLists.txt b/gui/plugins/statistics/Models/CMakeLists.txt index 90814334..00b4dd5e 100644 --- a/gui/plugins/statistics/Models/CMakeLists.txt +++ b/gui/plugins/statistics/Models/CMakeLists.txt @@ -12,16 +12,11 @@ include_directories(../../../common) set(SOURCES ModelStatistics.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Histogram.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/RowHistograms.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/TableModel.cpp ) set(HEADERS ModelStatistics.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Histogram.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/RowHistograms.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/TableModel.h ) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) +target_link_libraries(${PROJECT_NAME}_Models PRIVATE Common_lib) diff --git a/gui/plugins/statistics/Presenters/CMakeLists.txt b/gui/plugins/statistics/Presenters/CMakeLists.txt index 86a5af48..f59a61fd 100644 --- a/gui/plugins/statistics/Presenters/CMakeLists.txt +++ b/gui/plugins/statistics/Presenters/CMakeLists.txt @@ -12,11 +12,10 @@ include_directories(../../../common) set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/PresenterStatistics.h - ) +) set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/PresenterStatistics.cpp - ) - +) add_library(${PROJECT_NAME}_Presenters STATIC ${SOURCES} ${HEADERS}) diff --git a/gui/plugins/statistics/Views/CMakeLists.txt b/gui/plugins/statistics/Views/CMakeLists.txt index fecb2e19..4ea4d3ff 100644 --- a/gui/plugins/statistics/Views/CMakeLists.txt +++ b/gui/plugins/statistics/Views/CMakeLists.txt @@ -11,32 +11,20 @@ include_directories(../../../common) set(SOURCES - TrafficScene.cpp - TrajectoryGraphicsItem.cpp - ViewStatistics.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Plot.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/RowHistograms.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/CenteredTextItem.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/PlotGraphicsItem.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Graph.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/PlotAxes.cpp - ) + TrafficScene.cpp + TrajectoryGraphicsItem.cpp + ViewStatistics.cpp +) set(HEADERS - TrafficScene.h - TrajectoryGraphicsItem.h - ViewStatistics.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Plot.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/RowHistograms.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/CenteredTextItem.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/PlotGraphicsItem.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Graph.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/PlotAxes.h - ) + TrafficScene.h + TrajectoryGraphicsItem.h + ViewStatistics.h +) set(UI - ViewStatistics.ui - ) + ViewStatistics.ui +) add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) +target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets Common_lib) diff --git a/gui/plugins/system/CMakeLists.txt b/gui/plugins/system/CMakeLists.txt index e791b901..6e5a093a 100644 --- a/gui/plugins/system/CMakeLists.txt +++ b/gui/plugins/system/CMakeLists.txt @@ -32,32 +32,40 @@ include_directories(../../application/Interfaces) include_directories(${Qt5Widgets_INCLUDE_DIRS}) # include interfaces, models and views -add_subdirectory(Interfaces) add_subdirectory(Models) add_subdirectory(Views) -# include headers and sources of this plugin -set(SOURCES SystemPlugin.cpp) -set(HEADERS SystemPlugin.h) qt5_add_resources(openPASS-System.qrc) -# declare target library -add_library(System SHARED ${SOURCES} ${HEADERS} ) - -# link with Qt libraries, models, views and Interfaces -target_link_libraries(System PRIVATE - Qt5::Widgets - Window - Component - Project - ${PROJECT_NAME}_Models - ${PROJECT_NAME}_Views - ${PROJECT_NAME}_Interfaces) - -if(WIN32) - install(TARGETS System - RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) -elseif(UNIX) - install(TARGETS System - LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) -endif() \ No newline at end of file +add_openpass_target( + NAME System TYPE library LINKAGE shared COMPONENT gui + + HEADERS + Interfaces/openPASS-System/SystemComponentInputItemInterface.h + Interfaces/openPASS-System/SystemComponentInputMapInterface.h + Interfaces/openPASS-System/SystemComponentItemInterface.h + Interfaces/openPASS-System/SystemComponentManagerInterface.h + Interfaces/openPASS-System/SystemComponentMapInterface.h + Interfaces/openPASS-System/SystemComponentOutputItemInterface.h + Interfaces/openPASS-System/SystemComponentOutputMapInterface.h + Interfaces/openPASS-System/SystemComponentParameterItemInterface.h + Interfaces/openPASS-System/SystemComponentParameterMapInterface.h + Interfaces/openPASS-System/SystemComponentScheduleInterface.h + Interfaces/openPASS-System/SystemConnectionMapInterface.h + Interfaces/openPASS-System/SystemConnectionItemInterface.h + Interfaces/openPASS-System/SystemInterface.h + Interfaces/openPASS-System/SystemItemInterface.h + Interfaces/openPASS-System/SystemMapInterface.h + SystemPlugin.h + + SOURCES + SystemPlugin.cpp + + LIBRARIES + Qt5::Widgets + Window + Component + Project + ${PROJECT_NAME}_Models + ${PROJECT_NAME}_Views +) \ No newline at end of file diff --git a/gui/plugins/system/Interfaces/CMakeLists.txt b/gui/plugins/system/Interfaces/CMakeLists.txt deleted file mode 100644 index 365f98f8..00000000 --- a/gui/plugins/system/Interfaces/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -# define headers variable -set(HEADERS "") - -# build all Interface libraries -include(openPASS-System/CMakeLists.txt) - -# bundle all libraries to one interface library -add_library(${PROJECT_NAME}_Interfaces STATIC ${HEADERS}) diff --git a/gui/plugins/system/Interfaces/openPASS-System/CMakeLists.txt b/gui/plugins/system/Interfaces/openPASS-System/CMakeLists.txt deleted file mode 100644 index 23385a02..00000000 --- a/gui/plugins/system/Interfaces/openPASS-System/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# ********************************************************************** - -set(HEADERS - ${HEADERS} - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentInputItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentInputMapInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentManagerInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentMapInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentOutputItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentOutputMapInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentParameterItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentParameterMapInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemComponentScheduleInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemConnectionMapInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemConnectionItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemItemInterface.h - ${CMAKE_CURRENT_LIST_DIR}/SystemMapInterface.h) diff --git a/gui/plugins/system/Models/CMakeLists.txt b/gui/plugins/system/Models/CMakeLists.txt index b130a505..1bddb1cf 100644 --- a/gui/plugins/system/Models/CMakeLists.txt +++ b/gui/plugins/system/Models/CMakeLists.txt @@ -10,25 +10,25 @@ # **********************************************************************/ set(SOURCES - SystemComponentInputItemModel.cpp - SystemComponentInputMapModel.cpp - SystemComponentItemModel.cpp - SystemComponentManagerModel.cpp - SystemComponentMapModel.cpp - SystemComponentOutputItemModel.cpp - SystemComponentOutputMapModel.cpp - SystemComponentParameterItemModel.cpp - SystemComponentParameterMapModel.cpp - SystemComponentScheduleModel.cpp - SystemConnectionItemModel.cpp - SystemConnectionMapModel.cpp - SystemItemModel.cpp - SystemMapModel.cpp - SystemModel.cpp - SystemXMLBaseModel.cpp - SystemXMLLoadModel.cpp - SystemXMLSaveModel.cpp - ) + SystemComponentInputItemModel.cpp + SystemComponentInputMapModel.cpp + SystemComponentItemModel.cpp + SystemComponentManagerModel.cpp + SystemComponentMapModel.cpp + SystemComponentOutputItemModel.cpp + SystemComponentOutputMapModel.cpp + SystemComponentParameterItemModel.cpp + SystemComponentParameterMapModel.cpp + SystemComponentScheduleModel.cpp + SystemConnectionItemModel.cpp + SystemConnectionMapModel.cpp + SystemItemModel.cpp + SystemMapModel.cpp + SystemModel.cpp + SystemXMLBaseModel.cpp + SystemXMLLoadModel.cpp + SystemXMLSaveModel.cpp +) set(HEADERS SystemComponentInputItemModel.h @@ -49,6 +49,6 @@ set(HEADERS SystemXMLBaseModel.h SystemXMLLoadModel.h SystemXMLSaveModel.h - ) +) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) diff --git a/gui/plugins/system/Views/CMakeLists.txt b/gui/plugins/system/Views/CMakeLists.txt index b627089f..6187bb06 100644 --- a/gui/plugins/system/Views/CMakeLists.txt +++ b/gui/plugins/system/Views/CMakeLists.txt @@ -10,62 +10,62 @@ # **********************************************************************/ set(SOURCES - DoubleSpinBoxView.cpp - SpinBoxView.cpp - SystemBaseView.cpp - SystemComponentInputItemView.cpp - SystemComponentItemView.cpp - SystemComponentManagerView.cpp - SystemComponentOutputItemView.cpp - SystemComponentParameterItemView.cpp - SystemComponentParameterValueBoolView.cpp - SystemComponentParameterValueDoubleView.cpp - SystemComponentParameterValueFloatView.cpp - SystemComponentParameterValueIntView.cpp - SystemComponentParameterValueNormalDistributionView.cpp - SystemComponentParameterValueStringView.cpp - SystemComponentScheduleView.cpp - SystemComponentTitleView.cpp - SystemItemView.cpp - SystemView.cpp - WidgetView.cpp - SystemTabView.cpp - ) + DoubleSpinBoxView.cpp + SpinBoxView.cpp + SystemBaseView.cpp + SystemComponentInputItemView.cpp + SystemComponentItemView.cpp + SystemComponentManagerView.cpp + SystemComponentOutputItemView.cpp + SystemComponentParameterItemView.cpp + SystemComponentParameterValueBoolView.cpp + SystemComponentParameterValueDoubleView.cpp + SystemComponentParameterValueFloatView.cpp + SystemComponentParameterValueIntView.cpp + SystemComponentParameterValueNormalDistributionView.cpp + SystemComponentParameterValueStringView.cpp + SystemComponentScheduleView.cpp + SystemComponentTitleView.cpp + SystemItemView.cpp + SystemView.cpp + WidgetView.cpp + SystemTabView.cpp +) set(HEADERS - DoubleSpinBoxView.h - SpinBoxView.h - SystemBaseView.h - SystemComponentInputItemView.h - SystemComponentItemView.h - SystemComponentManagerView.h - SystemComponentOutputItemView.h - SystemComponentParameterItemView.h - SystemComponentParameterValueBoolView.h - SystemComponentParameterValueDoubleView.h - SystemComponentParameterValueFloatView.h - SystemComponentParameterValueIntView.h - SystemComponentParameterValueNormalDistributionView.h - SystemComponentParameterValueStringView.h - SystemComponentScheduleView.h - SystemComponentTitleView.h - SystemItemView.h - SystemView.h - WidgetView.h - SystemTabView.h - ) + DoubleSpinBoxView.h + SpinBoxView.h + SystemBaseView.h + SystemComponentInputItemView.h + SystemComponentItemView.h + SystemComponentManagerView.h + SystemComponentOutputItemView.h + SystemComponentParameterItemView.h + SystemComponentParameterValueBoolView.h + SystemComponentParameterValueDoubleView.h + SystemComponentParameterValueFloatView.h + SystemComponentParameterValueIntView.h + SystemComponentParameterValueNormalDistributionView.h + SystemComponentParameterValueStringView.h + SystemComponentScheduleView.h + SystemComponentTitleView.h + SystemItemView.h + SystemView.h + WidgetView.h + SystemTabView.h +) set(UI - SystemComponentInputItemView.ui - SystemComponentItemView.ui - SystemComponentManagerView.ui - SystemComponentOutputItemView.ui - SystemComponentParameterItemView.ui - SystemComponentScheduleView.ui - SystemComponentTitleView.ui - SystemView.ui - SystemTabView.ui - ) + SystemComponentInputItemView.ui + SystemComponentItemView.ui + SystemComponentManagerView.ui + SystemComponentOutputItemView.ui + SystemComponentParameterItemView.ui + SystemComponentScheduleView.ui + SystemComponentTitleView.ui + SystemView.ui + SystemTabView.ui +) add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) diff --git a/gui/plugins/timePlot/CMakeLists.txt b/gui/plugins/timePlot/CMakeLists.txt index cc16b88c..1599c4df 100644 --- a/gui/plugins/timePlot/CMakeLists.txt +++ b/gui/plugins/timePlot/CMakeLists.txt @@ -21,7 +21,7 @@ find_package(Qt5Widgets REQUIRED) # set include directories include_directories(.) -include_directories(Interfaces) +#include_directories(Interfaces) include_directories(Models) include_directories(Presenters) include_directories(Views) @@ -31,31 +31,23 @@ include_directories(../../common) include_directories(${Qt5Widgets_INCLUDE_DIRS}) # include interfaces, models and views -add_subdirectory(Interfaces) add_subdirectory(Models) add_subdirectory(Presenters) add_subdirectory(Views) -# include headers and sources of this plugin -set(SOURCES PluginTimePlot.cpp) -set(HEADERS PluginTimePlot.h) - -# declare target library -add_library(TimePlot SHARED ${SOURCES} ${HEADERS} ) - -# link with Qt libraries, models, views and Interfaces -target_link_libraries(TimePlot PRIVATE - Qt5::Widgets - Window - ${PROJECT_NAME}_Models - ${PROJECT_NAME}_Views - ${PROJECT_NAME}_Interfaces - ${PROJECT_NAME}_Presenters) - -if(WIN32) - install(TARGETS TimePlot - RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) -elseif(UNIX) - install(TARGETS TimePlot - LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) -endif() +add_openpass_target( + NAME TimePlot TYPE library LINKAGE shared COMPONENT gui + + HEADERS + PluginTimePlot.h + + SOURCES + PluginTimePlot.cpp + + LIBRARIES + Qt5::Widgets + Window + ${PROJECT_NAME}_Models + ${PROJECT_NAME}_Views + ${PROJECT_NAME}_Presenters +) \ No newline at end of file diff --git a/gui/plugins/timePlot/Interfaces/CMakeLists.txt b/gui/plugins/timePlot/Interfaces/CMakeLists.txt deleted file mode 100644 index 10e7969c..00000000 --- a/gui/plugins/timePlot/Interfaces/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2020 ITK Engineering GmbH -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -# define headers variable -set(HEADERS "") - -# bundle all libraries to one interface library -add_library(${PROJECT_NAME}_Interfaces STATIC ${HEADERS}) diff --git a/gui/plugins/timePlot/Models/CMakeLists.txt b/gui/plugins/timePlot/Models/CMakeLists.txt index 3f54775e..106a775b 100644 --- a/gui/plugins/timePlot/Models/CMakeLists.txt +++ b/gui/plugins/timePlot/Models/CMakeLists.txt @@ -9,15 +9,16 @@ # **********************************************************************/ set(SOURCES - ModelTimePlot.cpp - ResultDirItemModel.cpp - TableModelPlot.cpp - ) + ModelTimePlot.cpp + ResultDirItemModel.cpp + TableModelPlot.cpp +) set(HEADERS - ModelTimePlot.h - ResultDirItemModel.h - TableModelPlot.h - ) + ModelTimePlot.h + ResultDirItemModel.h + TableModelPlot.h +) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) +target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) \ No newline at end of file diff --git a/gui/plugins/timePlot/Presenters/CMakeLists.txt b/gui/plugins/timePlot/Presenters/CMakeLists.txt index 737061c1..e226e850 100644 --- a/gui/plugins/timePlot/Presenters/CMakeLists.txt +++ b/gui/plugins/timePlot/Presenters/CMakeLists.txt @@ -10,11 +10,10 @@ set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/PresenterTimePlot.h - ) +) set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/PresenterTimePlot.cpp - ) +) - -add_library(${PROJECT_NAME}_Presenters STATIC ${SOURCES} ${HEADERS}) +add_library(${PROJECT_NAME}_Presenters STATIC ${SOURCES} ${HEADERS}) \ No newline at end of file diff --git a/gui/plugins/timePlot/Views/CMakeLists.txt b/gui/plugins/timePlot/Views/CMakeLists.txt index 9b014118..e0d2b189 100644 --- a/gui/plugins/timePlot/Views/CMakeLists.txt +++ b/gui/plugins/timePlot/Views/CMakeLists.txt @@ -9,28 +9,16 @@ # **********************************************************************/ set(SOURCES - ViewTimePlot.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Plot.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/RowHistograms.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/CenteredTextItem.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/PlotGraphicsItem.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Graph.cpp - ${CMAKE_CURRENT_LIST_DIR}/../../../common/PlotAxes.cpp - ) + ViewTimePlot.cpp +) set(HEADERS - ViewTimePlot.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Plot.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/RowHistograms.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/CenteredTextItem.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/PlotGraphicsItem.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/Graph.h - ${CMAKE_CURRENT_LIST_DIR}/../../../common/PlotAxes.h - ) + ViewTimePlot.h +) set(UI - ViewTimePlot.ui - ) + ViewTimePlot.ui +) add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) +target_link_libraries(${PROJECT_NAME}_Models PRIVATE Common_lib Qt5::Widgets) \ No newline at end of file diff --git a/gui/plugins/window/CMakeLists.txt b/gui/plugins/window/CMakeLists.txt index 930efa61..adc24c92 100644 --- a/gui/plugins/window/CMakeLists.txt +++ b/gui/plugins/window/CMakeLists.txt @@ -30,31 +30,32 @@ include_directories(../../application/Interfaces) include_directories(${Qt5Widgets_INCLUDE_DIRS}) # include interfaces, models and views -add_subdirectory(Interfaces) add_subdirectory(Models) add_subdirectory(Presenters) add_subdirectory(Views) -# include headers and sources of this plugin -set(SOURCES WindowPlugin.cpp) -set(HEADERS WindowPlugin.h) set(RESOURCES openPASS-Window.qrc) -# declare target library -add_library(Window SHARED ${SOURCES} ${HEADERS} ${RESOURCES}) - -# link with Qt libraries, models, views and Interfaces -target_link_libraries(Window PRIVATE - Qt5::Widgets - ${PROJECT_NAME}_Models - ${PROJECT_NAME}_Views - ${PROJECT_NAME}_Presenters - ${PROJECT_NAME}_Interfaces) - -if(WIN32) - install(TARGETS Window - RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) -elseif(UNIX) - install(TARGETS Window - LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) -endif() +add_openpass_target( + NAME Window TYPE library LINKAGE shared COMPONENT gui + + HEADERS + Interfaces/openPASS-Window/WindowInterface.h + ../../application/Interfaces/openPASS/PluginInterface.h + ../../application/Interfaces/openPASS/PluginManagerInterface.h + ../../application/Interfaces/openPASS/RandomInterface.h + ../../application/Interfaces/openPASS/ServiceInterface.h + ../../application/Interfaces/openPASS/ServiceManagerInterface.h + ../../application/Interfaces/openPASS/ioplugininterface.h + WindowPlugin.h + + SOURCES + WindowPlugin.cpp + ${RESOURCES} + + LIBRARIES + Qt5::Widgets + ${PROJECT_NAME}_Models + ${PROJECT_NAME}_Views + ${PROJECT_NAME}_Presenters +) \ No newline at end of file diff --git a/gui/plugins/window/Interfaces/CMakeLists.txt b/gui/plugins/window/Interfaces/CMakeLists.txt deleted file mode 100644 index 9a2b0fdf..00000000 --- a/gui/plugins/window/Interfaces/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -# define headers variable -set(HEADERS "") - -# build all Interface libraries -include(openPASS-Window/CMakeLists.txt) -include(../../../application/Interfaces/openPASS/CMakeLists.txt) - -# bundle all libraries to one interface library -add_library(${PROJECT_NAME}_Interfaces STATIC ${HEADERS}) diff --git a/gui/plugins/window/Interfaces/openPASS-Window/CMakeLists.txt b/gui/plugins/window/Interfaces/openPASS-Window/CMakeLists.txt deleted file mode 100644 index 81648e4f..00000000 --- a/gui/plugins/window/Interfaces/openPASS-Window/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# /********************************************************************* -# * Copyright (c) 2019 Volkswagen Group of America. -# * -# * This program and the accompanying materials are made -# * available under the terms of the Eclipse Public License 2.0 -# * which is available at https://www.eclipse.org/legal/epl-2.0/ -# * -# * SPDX-License-Identifier: EPL-2.0 -# **********************************************************************/ - -set(HEADERS - ${HEADERS} - ${CMAKE_CURRENT_LIST_DIR}/WindowInterface.h) diff --git a/gui/plugins/window/Models/CMakeLists.txt b/gui/plugins/window/Models/CMakeLists.txt index 1bae4af4..83012784 100644 --- a/gui/plugins/window/Models/CMakeLists.txt +++ b/gui/plugins/window/Models/CMakeLists.txt @@ -10,12 +10,11 @@ set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/WindowModel.cpp - - ) +) set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/WindowModel.h - ) +) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) diff --git a/gui/plugins/window/Presenters/CMakeLists.txt b/gui/plugins/window/Presenters/CMakeLists.txt index a4bb5ea3..abad8af8 100644 --- a/gui/plugins/window/Presenters/CMakeLists.txt +++ b/gui/plugins/window/Presenters/CMakeLists.txt @@ -10,11 +10,10 @@ set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/WindowPresenter.h - ) +) set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/WindowPresenter.cpp - ) - +) add_library(${PROJECT_NAME}_Presenters STATIC ${SOURCES} ${HEADERS}) diff --git a/gui/plugins/window/Views/CMakeLists.txt b/gui/plugins/window/Views/CMakeLists.txt index b9c4337d..98d549e1 100644 --- a/gui/plugins/window/Views/CMakeLists.txt +++ b/gui/plugins/window/Views/CMakeLists.txt @@ -11,16 +11,16 @@ set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/WindowView.cpp ${CMAKE_CURRENT_LIST_DIR}/LogoDelegate.cpp - ) +) set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/WindowView.h ${CMAKE_CURRENT_LIST_DIR}/LogoDelegate.h - ) +) set(UI ${CMAKE_CURRENT_LIST_DIR}/WindowView.ui - ) +) add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets) -- GitLab From e2ea12ea17edc37a568c2055300ae9cbcb2b965a Mon Sep 17 00:00:00 2001 From: Robin Caloudis Date: Wed, 29 Sep 2021 15:06:47 +0200 Subject: [PATCH 2/3] mod(gui): Improve name for common gui lib Signed-off-by: Robin Caloudis --- gui/common/CMakeLists.txt | 4 ++-- gui/plugins/pcmEvaluation/Models/CMakeLists.txt | 2 +- .../Models/ConfigurationGeneratorPcm/CMakeLists.txt | 2 +- gui/plugins/statistics/Models/CMakeLists.txt | 2 +- gui/plugins/statistics/Views/CMakeLists.txt | 2 +- gui/plugins/timePlot/Views/CMakeLists.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/common/CMakeLists.txt b/gui/common/CMakeLists.txt index 8a37daa3..42cdcfc8 100644 --- a/gui/common/CMakeLists.txt +++ b/gui/common/CMakeLists.txt @@ -99,9 +99,9 @@ include_directories(pcm/DataStructuresBase) include_directories(pcm/PCM_Data) include_directories(pcm/PCM_Importer) -add_library(Common_lib STATIC ${SOURCES} ${HEADERS}) +add_library(Gui_Common STATIC ${SOURCES} ${HEADERS}) -target_link_libraries(Common_lib PRIVATE +target_link_libraries(Gui_Common PRIVATE Qt5::Widgets Qt5::Core Qt5::Xml diff --git a/gui/plugins/pcmEvaluation/Models/CMakeLists.txt b/gui/plugins/pcmEvaluation/Models/CMakeLists.txt index 49b2b48f..103b9bfc 100644 --- a/gui/plugins/pcmEvaluation/Models/CMakeLists.txt +++ b/gui/plugins/pcmEvaluation/Models/CMakeLists.txt @@ -21,4 +21,4 @@ set(HEADERS ) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Xml Common_lib) \ No newline at end of file +target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Xml Gui_Common) \ No newline at end of file diff --git a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt index 8c5c161d..f98e467b 100644 --- a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt @@ -32,4 +32,4 @@ set(HEADERS ) add_library(ConfigurationGeneratorPcm STATIC ${SOURCES} ${HEADERS}) -target_link_libraries(ConfigurationGeneratorPcm Common_lib) +target_link_libraries(ConfigurationGeneratorPcm Gui_Common) diff --git a/gui/plugins/statistics/Models/CMakeLists.txt b/gui/plugins/statistics/Models/CMakeLists.txt index 00b4dd5e..f8e83846 100644 --- a/gui/plugins/statistics/Models/CMakeLists.txt +++ b/gui/plugins/statistics/Models/CMakeLists.txt @@ -19,4 +19,4 @@ set(HEADERS ) add_library(${PROJECT_NAME}_Models STATIC ${SOURCES} ${HEADERS}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Common_lib) +target_link_libraries(${PROJECT_NAME}_Models PRIVATE Gui_Common) diff --git a/gui/plugins/statistics/Views/CMakeLists.txt b/gui/plugins/statistics/Views/CMakeLists.txt index 4ea4d3ff..67d73b29 100644 --- a/gui/plugins/statistics/Views/CMakeLists.txt +++ b/gui/plugins/statistics/Views/CMakeLists.txt @@ -27,4 +27,4 @@ set(UI ) add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets Common_lib) +target_link_libraries(${PROJECT_NAME}_Models PRIVATE Qt5::Widgets Gui_Common) diff --git a/gui/plugins/timePlot/Views/CMakeLists.txt b/gui/plugins/timePlot/Views/CMakeLists.txt index e0d2b189..f660402e 100644 --- a/gui/plugins/timePlot/Views/CMakeLists.txt +++ b/gui/plugins/timePlot/Views/CMakeLists.txt @@ -21,4 +21,4 @@ set(UI ) add_library(${PROJECT_NAME}_Views STATIC ${SOURCES} ${HEADERS} ${UI}) -target_link_libraries(${PROJECT_NAME}_Models PRIVATE Common_lib Qt5::Widgets) \ No newline at end of file +target_link_libraries(${PROJECT_NAME}_Models PRIVATE Gui_Common Qt5::Widgets) \ No newline at end of file -- GitLab From 457120933eb06096221ba8a12b34588fc1df48cc Mon Sep 17 00:00:00 2001 From: Robin Caloudis Date: Wed, 29 Sep 2021 15:21:53 +0200 Subject: [PATCH 3/3] mod(gui): Update copyright header Signed-off-by: Robin Caloudis --- gui/CMakeLists.txt | 1 + gui/application/CMakeLists.txt | 2 ++ gui/application/Models/CMakeLists.txt | 1 + gui/common/CMakeLists.txt | 1 + gui/plugins/component/CMakeLists.txt | 1 + gui/plugins/component/Models/CMakeLists.txt | 1 + gui/plugins/pcmEvaluation/CMakeLists.txt | 1 + .../pcmEvaluation/Models/CMakeLists.txt | 1 + .../pcmEvaluation/Presenters/CMakeLists.txt | 1 + .../pcmEvaluation/Views/CMakeLists.txt | 1 + gui/plugins/pcmSimulation/CMakeLists.txt | 34 +------------------ .../pcmSimulation/Models/CMakeLists.txt | 1 + .../ConfigurationGeneratorPcm/CMakeLists.txt | 1 + .../DataStructuresXml/CMakeLists.txt | 1 + .../DataStructuresXosc/CMakeLists.txt | 1 + .../pcmSimulation/Presenters/CMakeLists.txt | 1 + .../pcmSimulation/Views/CMakeLists.txt | 1 + gui/plugins/project/CMakeLists.txt | 1 + gui/plugins/project/Models/CMakeLists.txt | 1 + gui/plugins/project/Presenters/CMakeLists.txt | 1 + gui/plugins/project/Views/CMakeLists.txt | 1 + gui/plugins/statistics/CMakeLists.txt | 1 + gui/plugins/statistics/Models/CMakeLists.txt | 1 + .../statistics/Presenters/CMakeLists.txt | 1 + gui/plugins/statistics/Views/CMakeLists.txt | 1 + gui/plugins/system/CMakeLists.txt | 1 + gui/plugins/system/Models/CMakeLists.txt | 1 + gui/plugins/system/Views/CMakeLists.txt | 1 + gui/plugins/timePlot/CMakeLists.txt | 1 + gui/plugins/timePlot/Models/CMakeLists.txt | 1 + .../timePlot/Presenters/CMakeLists.txt | 1 + gui/plugins/timePlot/Views/CMakeLists.txt | 1 + gui/plugins/window/CMakeLists.txt | 1 + gui/plugins/window/Models/CMakeLists.txt | 1 + gui/plugins/window/Presenters/CMakeLists.txt | 1 + gui/plugins/window/Views/CMakeLists.txt | 1 + 36 files changed, 37 insertions(+), 33 deletions(-) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 540a3216..faff1268 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -1,6 +1,7 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. # * Copyright (c) 2020, 2021 ITK Engineering GmbH. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/application/CMakeLists.txt b/gui/application/CMakeLists.txt index 981e7968..ab9df26b 100644 --- a/gui/application/CMakeLists.txt +++ b/gui/application/CMakeLists.txt @@ -1,6 +1,8 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. # * Copyright (c) 2021 ITK Engineering GmbH. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +# * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 # * which is available at https://www.eclipse.org/legal/epl-2.0/ diff --git a/gui/application/Models/CMakeLists.txt b/gui/application/Models/CMakeLists.txt index f4d579e3..341c4745 100644 --- a/gui/application/Models/CMakeLists.txt +++ b/gui/application/Models/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/common/CMakeLists.txt b/gui/common/CMakeLists.txt index 42cdcfc8..1136bbde 100644 --- a/gui/common/CMakeLists.txt +++ b/gui/common/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/component/CMakeLists.txt b/gui/plugins/component/CMakeLists.txt index 0430198f..84f67cae 100644 --- a/gui/plugins/component/CMakeLists.txt +++ b/gui/plugins/component/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/component/Models/CMakeLists.txt b/gui/plugins/component/Models/CMakeLists.txt index 4fd8d600..dfd86cd3 100644 --- a/gui/plugins/component/Models/CMakeLists.txt +++ b/gui/plugins/component/Models/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmEvaluation/CMakeLists.txt b/gui/plugins/pcmEvaluation/CMakeLists.txt index 33eb2e73..f1d5f861 100644 --- a/gui/plugins/pcmEvaluation/CMakeLists.txt +++ b/gui/plugins/pcmEvaluation/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmEvaluation/Models/CMakeLists.txt b/gui/plugins/pcmEvaluation/Models/CMakeLists.txt index 103b9bfc..4cbfe5dc 100644 --- a/gui/plugins/pcmEvaluation/Models/CMakeLists.txt +++ b/gui/plugins/pcmEvaluation/Models/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmEvaluation/Presenters/CMakeLists.txt b/gui/plugins/pcmEvaluation/Presenters/CMakeLists.txt index 86957f2f..1633a3fc 100644 --- a/gui/plugins/pcmEvaluation/Presenters/CMakeLists.txt +++ b/gui/plugins/pcmEvaluation/Presenters/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmEvaluation/Views/CMakeLists.txt b/gui/plugins/pcmEvaluation/Views/CMakeLists.txt index 104b970e..cd535d59 100644 --- a/gui/plugins/pcmEvaluation/Views/CMakeLists.txt +++ b/gui/plugins/pcmEvaluation/Views/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmSimulation/CMakeLists.txt b/gui/plugins/pcmSimulation/CMakeLists.txt index 0a2c4726..9cb018d4 100644 --- a/gui/plugins/pcmSimulation/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 @@ -38,42 +39,10 @@ include_directories(${Qt5Xml_INCLUDE_DIRS}) include_directories(${Qt5Sql_INCLUDE_DIRS}) # include interfaces, models and views -# add_subdirectory(Interfaces) add_subdirectory(Models) add_subdirectory(Presenters) add_subdirectory(Views) -# include headers and sources of this plugin -# set(SOURCES -# PluginPcm.cpp) - -# set(HEADERS -# Interfaces/openPASS-PCM/PCMInterface.h -# PluginPcm.h) - -# declare target library -# add_library(Pcm_sim SHARED ${SOURCES} ${HEADERS} ) - -# # link with Qt libraries, models, views and Interfaces -# target_link_libraries(Pcm_sim PRIVATE -# # Qt5::Widgets -# # Qt5::Core -# # Qt5::Xml -# # Qt5::Sql -# Window -# ${PROJECT_NAME}_Models -# ${PROJECT_NAME}_Views -# #${PROJECT_NAME}_Interfaces -# ${PROJECT_NAME}_Presenters) - -# if(WIN32) -# install(TARGETS Pcm_sim -# RUNTIME DESTINATION ${SUBDIR_LIB_GUI}) -# elseif(UNIX) -# install(TARGETS Pcm_sim -# LIBRARY DESTINATION ${SUBDIR_LIB_GUI}) -# endif() - add_openpass_target( NAME Pcm_sim TYPE library LINKAGE shared COMPONENT gui @@ -88,6 +57,5 @@ add_openpass_target( Window ${PROJECT_NAME}_Models ${PROJECT_NAME}_Views - #${PROJECT_NAME}_Interfaces ${PROJECT_NAME}_Presenters ) \ No newline at end of file diff --git a/gui/plugins/pcmSimulation/Models/CMakeLists.txt b/gui/plugins/pcmSimulation/Models/CMakeLists.txt index 55c0eecd..af2613e6 100644 --- a/gui/plugins/pcmSimulation/Models/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Models/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt index f98e467b..595e24db 100644 --- a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXml/CMakeLists.txt b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXml/CMakeLists.txt index 25d58090..7249602a 100644 --- a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXml/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXml/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXosc/CMakeLists.txt b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXosc/CMakeLists.txt index 7c6725f9..3e49f453 100644 --- a/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXosc/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Models/ConfigurationGeneratorPcm/DataStructuresXosc/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmSimulation/Presenters/CMakeLists.txt b/gui/plugins/pcmSimulation/Presenters/CMakeLists.txt index 0132837b..30714452 100644 --- a/gui/plugins/pcmSimulation/Presenters/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Presenters/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/pcmSimulation/Views/CMakeLists.txt b/gui/plugins/pcmSimulation/Views/CMakeLists.txt index 211dd40b..f75d2276 100644 --- a/gui/plugins/pcmSimulation/Views/CMakeLists.txt +++ b/gui/plugins/pcmSimulation/Views/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/project/CMakeLists.txt b/gui/plugins/project/CMakeLists.txt index 0ec46686..c7dcf564 100644 --- a/gui/plugins/project/CMakeLists.txt +++ b/gui/plugins/project/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/project/Models/CMakeLists.txt b/gui/plugins/project/Models/CMakeLists.txt index 311a8883..b233bd12 100644 --- a/gui/plugins/project/Models/CMakeLists.txt +++ b/gui/plugins/project/Models/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/project/Presenters/CMakeLists.txt b/gui/plugins/project/Presenters/CMakeLists.txt index 9a019569..5755bcb6 100644 --- a/gui/plugins/project/Presenters/CMakeLists.txt +++ b/gui/plugins/project/Presenters/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/project/Views/CMakeLists.txt b/gui/plugins/project/Views/CMakeLists.txt index 2c68e22e..bc2e92f9 100644 --- a/gui/plugins/project/Views/CMakeLists.txt +++ b/gui/plugins/project/Views/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/statistics/CMakeLists.txt b/gui/plugins/statistics/CMakeLists.txt index bff42967..315f7a34 100644 --- a/gui/plugins/statistics/CMakeLists.txt +++ b/gui/plugins/statistics/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2020 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/statistics/Models/CMakeLists.txt b/gui/plugins/statistics/Models/CMakeLists.txt index f8e83846..0c1ed00c 100644 --- a/gui/plugins/statistics/Models/CMakeLists.txt +++ b/gui/plugins/statistics/Models/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2020 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/statistics/Presenters/CMakeLists.txt b/gui/plugins/statistics/Presenters/CMakeLists.txt index f59a61fd..7892c1cd 100644 --- a/gui/plugins/statistics/Presenters/CMakeLists.txt +++ b/gui/plugins/statistics/Presenters/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2020 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/statistics/Views/CMakeLists.txt b/gui/plugins/statistics/Views/CMakeLists.txt index 67d73b29..671b26ed 100644 --- a/gui/plugins/statistics/Views/CMakeLists.txt +++ b/gui/plugins/statistics/Views/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2020 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/system/CMakeLists.txt b/gui/plugins/system/CMakeLists.txt index 6e5a093a..cb5c8b61 100644 --- a/gui/plugins/system/CMakeLists.txt +++ b/gui/plugins/system/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/system/Models/CMakeLists.txt b/gui/plugins/system/Models/CMakeLists.txt index 1bddb1cf..f5f45502 100644 --- a/gui/plugins/system/Models/CMakeLists.txt +++ b/gui/plugins/system/Models/CMakeLists.txt @@ -1,6 +1,7 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/system/Views/CMakeLists.txt b/gui/plugins/system/Views/CMakeLists.txt index 6187bb06..ccf6c63b 100644 --- a/gui/plugins/system/Views/CMakeLists.txt +++ b/gui/plugins/system/Views/CMakeLists.txt @@ -1,6 +1,7 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. # * Copyright (c) 2021 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/timePlot/CMakeLists.txt b/gui/plugins/timePlot/CMakeLists.txt index 1599c4df..59404802 100644 --- a/gui/plugins/timePlot/CMakeLists.txt +++ b/gui/plugins/timePlot/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2020 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/timePlot/Models/CMakeLists.txt b/gui/plugins/timePlot/Models/CMakeLists.txt index 106a775b..78b6884b 100644 --- a/gui/plugins/timePlot/Models/CMakeLists.txt +++ b/gui/plugins/timePlot/Models/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2020 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/timePlot/Presenters/CMakeLists.txt b/gui/plugins/timePlot/Presenters/CMakeLists.txt index e226e850..6208fb8c 100644 --- a/gui/plugins/timePlot/Presenters/CMakeLists.txt +++ b/gui/plugins/timePlot/Presenters/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2020 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/timePlot/Views/CMakeLists.txt b/gui/plugins/timePlot/Views/CMakeLists.txt index f660402e..bbb4d270 100644 --- a/gui/plugins/timePlot/Views/CMakeLists.txt +++ b/gui/plugins/timePlot/Views/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2020 ITK Engineering GmbH +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/window/CMakeLists.txt b/gui/plugins/window/CMakeLists.txt index adc24c92..8c275720 100644 --- a/gui/plugins/window/CMakeLists.txt +++ b/gui/plugins/window/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/window/Models/CMakeLists.txt b/gui/plugins/window/Models/CMakeLists.txt index 83012784..7af1b3cb 100644 --- a/gui/plugins/window/Models/CMakeLists.txt +++ b/gui/plugins/window/Models/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/window/Presenters/CMakeLists.txt b/gui/plugins/window/Presenters/CMakeLists.txt index abad8af8..51f4f25a 100644 --- a/gui/plugins/window/Presenters/CMakeLists.txt +++ b/gui/plugins/window/Presenters/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 diff --git a/gui/plugins/window/Views/CMakeLists.txt b/gui/plugins/window/Views/CMakeLists.txt index 98d549e1..06ff95d9 100644 --- a/gui/plugins/window/Views/CMakeLists.txt +++ b/gui/plugins/window/Views/CMakeLists.txt @@ -1,5 +1,6 @@ # /********************************************************************* # * Copyright (c) 2019 Volkswagen Group of America. +# * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) # * # * This program and the accompanying materials are made # * available under the terms of the Eclipse Public License 2.0 -- GitLab