Commit 72be0790 authored by saubatn's avatar saubatn
Browse files

FEATURE 558 (task) fixed CEP MODELING issue on Windows platform: fix...

FEATURE 558 (task) fixed CEP MODELING issue on Windows platform: fix dependencies issues and Time.h/.cpp files renamed TimeMonitoring.h/.cpp which were confused with Windows system time.h (Visual Studio is not case sensitive for header includes!).

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@1680 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 7108352d
......@@ -60,6 +60,7 @@ add_definitions(-DCOMPILE_MML_MONIGORING_GUI_TOOL)
# add lib as a camitk tool
camitk_library( STATIC
NEEDS_LIBXML2
NEEDS_XSD
LIBNAME monitoringgui
SOURCES ${gui_SRCS}
NEEDS_CEP_LIBRARIES monitoring pml lml mml
......
......@@ -26,12 +26,13 @@
#ifndef STOPPINGCRITERION_STOPPINGCRITERIA_MULTIPLECRITERIA_ANDMULTIPLECRITERIA_H
#define STOPPINGCRITERION_STOPPINGCRITERIA_MULTIPLECRITERIA_ANDMULTIPLECRITERIA_H
#include <vector>
#include "MonitorIn.hxx"
#include <MonitorIn.hxx>
#include <MonitoringModel.hxx>
// Stopping criteria includes
#include "MultipleCriterion.h"
/**
*
* @ingroup group_cepmodeling_libraries_mml
......@@ -47,7 +48,7 @@ class AndMultipleCriterion: public MultipleCriterion
* constructor
* @param m the xsdcxx generated MultipleCriterion
*/
AndMultipleCriterion(mml::MultipleCriteria* m,MonitoringManager* monitoringManager, MultipleCriterion* parent=NULL);
AndMultipleCriterion(mml::MultipleCriteria* m, MonitoringManager* monitoringManager, MultipleCriterion* parent=NULL);
/// destructor
~AndMultipleCriterion();
......
......@@ -28,8 +28,8 @@
#define TOOLS_ATOMITERATOR_H
#include <string.h>
#include "PhysicalModel.h"
#include "Load.h"
#include <PhysicalModel.h>
#include <Load.h>
/**
*
* @ingroup group_cepmodeling_libraries_mml
......
......@@ -338,7 +338,7 @@ set(monitoring_H MMLAPI.h
Force.h
KineticEnergy.h
Position.h
Time.h
TimeMonitoring.h
Velocity.h
AndMultipleCriterion.h
OrMultipleCriterion.h
......@@ -395,7 +395,7 @@ set(monitoring_SRCS ${monitoring_H}
Force.cpp
KineticEnergy.cpp
Position.cpp
Time.cpp
TimeMonitoring.cpp
Velocity.cpp
AndMultipleCriterion.cpp
OrMultipleCriterion.cpp
......@@ -470,30 +470,22 @@ if(MML_GENERATE_GUI)
)
endif(MML_GENERATE_GUI)
set(monitoring_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
#${CMAKE_CURRENT_BINARY_DIR}/../schema # for the xsd generated headers
${MML_INCLUDE_DIRECTORIES}
${MML_SOFA_INCLUDE_DIR}
)
if(MML_GENERATE_GUI)
set(monitoring_INCLUDE_DIR ${monitoring_INCLUDE_DIR} ${QT_INCLUDE_DIR})
endif(MML_GENERATE_GUI)
add_definitions(-DCOMPILE_MML_TOOL)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
# add_definitions(-DCOMPILE_MML_TOOL)
# add_definitions(-D_CRT_SECURE_NO_WARNINGS)
# add lib as a camitk library
camitk_library( SHARED
SOURCES ${monitoring_SRCS}
DEFINES COMPILE_MML_TOOL
NEEDS_QT_MODULES
NEEDS_XERCESC
NEEDS_LIBXML2
NEEDS_CEP_LIBRARIES mml pml lml
EXTERNAL_LIBRARIES ${MML_SOFA_LIBS}
INCLUDE_DIRECTORIES ${monitoring_INCLUDE_DIR}
LINK_DIRECTORIES ${monitoring_link}
CEP_NAME CEP_MODELING
DESCRIPTION "Tools to monitor a biomechanical deformation."
)
......
......@@ -33,7 +33,7 @@
#include "Force.h"
#include "KineticEnergy.h"
#include "Position.h"
#include "Time.h"
#include "TimeMonitoring.h"
#include "Velocity.h"
/**
*
......
......@@ -29,7 +29,9 @@
#include <vector>
#include "MonitorIn.hxx"
#include <MonitorIn.hxx>
#include <MonitoringModel.hxx>
/**
*
* @ingroup group_cepmodeling_libraries_mml
......
......@@ -23,7 +23,7 @@
* $CAMITK_LICENCE_END$
****************************************************************************/
// Stopping criteria includes
#include "Time.h"
#include "TimeMonitoring.h"
// -------------------- constructor --------------------
Time::Time(mml::Time* c,MonitoringManager* monitoringManager, MultipleCriterion* parent): Criterion(c,monitoringManager,parent){
......
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