Commit 7108352d authored by saubatn's avatar saubatn
Browse files

UPDATED Library monitoring, remove all source subdirectories => create...

UPDATED Library monitoring, remove all source subdirectories => create mismatch of headers find when installing them (CamiTK install target does not consider subdirectories when installing header files => do not put subdirectories for your source tree). Should fix Windows CEP MODELING compilation issue.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@1679 ec899d31-69d1-42ba-9299-647d76f65fb3
parent b3c63d58
......@@ -23,8 +23,10 @@
* $CAMITK_LICENCE_END$
****************************************************************************/
// because of namespace problems with Component, put these include first
#include <monitoring/manager/MonitoringManagerFactory.h>
#include <monitoring/simulator/SimulatorFactory.h>
// Monitoring includes
#include <MonitoringManagerFactory.h>
#include <SimulatorFactory.h>
#include <mml/MonitorIn.hxx>
#include <lml/Translation.h>
#include <MultiComponent.h>
......
......@@ -23,10 +23,10 @@
* $CAMITK_LICENCE_END$
****************************************************************************/
#include<monitoring/manager/MonitoringManager.h>
#include<monitoringgui/MonitoringDialog.h>
#include<monitoringgui/MonitoringGuiManager.h>
// Monitoring includes
#include<MonitoringManager.h>
#include<MonitoringDialog.h>
#include<MonitoringGuiManager.h>
#include <Log.h>
......
......@@ -32,7 +32,8 @@
class MMLComponent;
class MMLMonitorDisplay;
#include <monitor/Monitor.h>
// Monitoring includes
#include <Monitor.h>
/**
* @ingroup group_cepmodeling_components_mml
......
......@@ -26,7 +26,8 @@
#ifndef MMLMonitorDisplay_H
#define MMLMonitorDisplay_H
#include <monitor/Monitor.h>
// Monitoring includes
#include <Monitor.h>
#include <QObject>
......@@ -62,4 +63,4 @@ class MMLMonitorDisplay:public QObject{
MMLComponent* manager;
};
#endif
\ No newline at end of file
#endif
......@@ -30,7 +30,8 @@
#include <vector>
#include <string>
#include <monitor/Monitor.h>
// Monitor includes
#include "Monitor.h"
class MMLMonitorDisplay;
class MMLComponent;
......
......@@ -62,8 +62,7 @@ camitk_library( STATIC
NEEDS_LIBXML2
LIBNAME monitoringgui
SOURCES ${gui_SRCS}
INCLUDE_DIRECTORIES ${MML_INCLUDE_DIRECTORIES} ${CAMITK_INCLUDE_DIR}/libraries/monitoring ${QT_INCLUDE_DIR}
NEEDS_CEP_LIBRARIES monitoring
NEEDS_CEP_LIBRARIES monitoring pml lml mml
)
add_dependencies(${LIB_NAME} ${LIB_NAME_MONITORING})
......@@ -98,4 +97,4 @@ cpack_add_component( ${LIB_NAME}
# install(TARGETS monitoringgui
# ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}
# COMPONENT monitoringgui
# )
\ No newline at end of file
# )
......@@ -22,17 +22,16 @@
*
* $CAMITK_LICENCE_END$
****************************************************************************/
// Monitor includes
#include "MonitoringDialog.h"
#include "MonitoringDriver.h"
#include "monitor/Monitor.h"
#include "stoppingCriterion/StoppingCriterion.h"
#include "manager/InteractiveMonitoringManager.h"
#include "stoppingCriterion/stoppingCriteria/Criterion.h"
#include "Monitor.h"
#include "MonitoringGuiManager.h"
#include "InteractiveMonitoringManager.h"
// Criterion includes
#include "StoppingCriterion.h"
#include "Criterion.h"
// qt
#include <QtGui>
......
......@@ -30,7 +30,9 @@
#include <QObject>
#include <manager/MonitoringManagerFactory.h>
// Monitor includes
#include "MonitoringManagerFactory.h"
class MonitoringDialog;
class MonitoringDriver;
/**
......@@ -115,4 +117,4 @@ class /* needed if you monitoringgui is compiled as shared: MML_MONITORING_GUI_A
};
#endif // MONITORINGGUIMANAGER_H
\ No newline at end of file
#endif // MONITORINGGUIMANAGER_H
......@@ -22,8 +22,8 @@
*
* $CAMITK_LICENCE_END$
****************************************************************************/
#include "stoppingCriterion/stoppingCriteria/multipleCriteria/AndMultipleCriterion.h"
// Stopping criteria includes
#include "AndMultipleCriterion.h"
// -------------------- cosntructor --------------------
AndMultipleCriterion::AndMultipleCriterion(mml::MultipleCriteria* m,MonitoringManager* monitoringManager, MultipleCriterion* parent): MultipleCriterion(m,monitoringManager,parent) {}
......
......@@ -30,7 +30,8 @@
#include "MonitorIn.hxx"
#include "stoppingCriterion/stoppingCriteria/MultipleCriterion.h"
// Stopping criteria includes
#include "MultipleCriterion.h"
/**
*
* @ingroup group_cepmodeling_libraries_mml
......@@ -57,4 +58,4 @@ class AndMultipleCriterion: public MultipleCriterion
std::string getName();
};
#endif // STOPPINGCRITERION_STOPPINGCRITERIA_MULTIPLECRITERIA_ANDMULTIPLECRITERIA_H
\ No newline at end of file
#endif // STOPPINGCRITERION_STOPPINGCRITERIA_MULTIPLECRITERIA_ANDMULTIPLECRITERIA_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment