Commit 5f53f8db authored by saubatn's avatar saubatn
Browse files

FIXED : Action MML is now ready to be compiled within CamiTK.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@326 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 4c4e5d9f
......@@ -2,5 +2,15 @@ camitk_extension(ACTION_EXTENSION
NEEDS_LIBXML2
NEEDS_XSD
NEEDS_TOOL pml mml monitoring lml
NEEDS_COMPONENT_EXTENSION mml physicalmodel vtkmesh
NEEDS_COMPONENT_EXTENSION physicalmodel mml vtkmesh physicalmodel
)
if(ACTION_MML)
#FIXME this is just to avoid link error for MSVC:
# msvc2008 (v9) cannot link mml.dll (the component) with the mml.lib (the tool)
# it complains it can not link with mml with itself, without considering it
# can be two different libs
if(WIN32)
set_target_properties(action-mml PROPERTIES OUTPUT_NAME action-mml)
endif()
endif()
\ No newline at end of file
......@@ -32,13 +32,14 @@
using namespace camitk;
class PMManagerDC;
#include "PMComponentAPI.h"
/**The manager of the Component data.
*
*
*/
class ComponentDC : public camitk::MeshComponent {
class PHYSICALMODEL_COMPONENT_API ComponentDC : public camitk::MeshComponent {
Q_OBJECT
public:
/// constructors
......
......@@ -30,6 +30,7 @@
#include <pml/StructuralComponent.h>
#include "ComponentDC.h"
class MultiComponentDCPopup;
class QPixmap;
......@@ -42,7 +43,7 @@ class StructuralComponentDC;
*
*/
class MultiComponentDC : public ComponentDC {
class PHYSICALMODEL_COMPONENT_API MultiComponentDC : public ComponentDC {
Q_OBJECT
public:
MultiComponentDC(camitk::Component *, PMManagerDC * pmManagerDC, MultiComponent *);
......
......@@ -29,7 +29,7 @@
#include <pml/StructuralComponent.h>
#include "ComponentDC.h"
#include "PMComponentAPI.h"
#include <algorithm>
#include <vtkSmartPointer.h>
......@@ -77,7 +77,7 @@ typedef std::map <Atom *, unsigned int>::iterator AtomVtkPointsIndexMapIterator;
*/
class StructuralComponentDC : public ComponentDC {
class PHYSICALMODEL_COMPONENT_API StructuralComponentDC : public ComponentDC {
Q_OBJECT
public:
/** Default constructor, set the 3rd parameter to false to delay the construction of the Geometry
......
Supports Markdown
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