COMP: use cmake auto generated export macro for Monteverdi modules (shared libs)

Modules/Visualization/Mapla/include/mvdMaplaApplication.h

@@ -46,6 +46,8 @@
 // Monteverdi includes (sorted by alphabetic order)
 #include "mvdI18nApplication.h"
 
+#include "OTBMaplaExport.h"
+
 /*****************************************************************************/
 /* PRE-DECLARATION SECTION                                                   */
 
@@ -70,7 +72,7 @@ class OTBApplicationsModel;
  * \ingroup OTBMapla
  *
  */
-class ITK_EXPORT MaplaApplication
+class OTBMapla_EXPORT MaplaApplication
   : public I18nApplication
 {
 

Modules/Visualization/Mapla/include/mvdMaplaMainWindow.h

@@ -47,6 +47,7 @@
 //
 #include "mvdI18nMainWindow.h"
 
+#include "OTBMaplaExport.h"
 
 /*****************************************************************************/
 /* PRE-DECLARATION SECTION                                                   */
@@ -80,7 +81,7 @@ class MaplaMainWindow;
  *
  * \brief The application main-widow widget.
  */
-class ITK_EXPORT MaplaMainWindow
+class OTBMapla_EXPORT MaplaMainWindow
   : public I18nMainWindow
 {
 

Modules/Visualization/Mapla/otb-module.cmake

@@ -3,13 +3,14 @@ set(DOCUMENTATION
   )
 
 otb_module( OTBMapla
+  ENABLE_SHARED
   DEPENDS
     OTBMonteverdiCore
     OTBMonteverdiGUI
     OTBQt4
 
   OPTIONAL_DEPENDS
-  
+
   DESCRIPTION
   "${DOCUMENTATION}"
   )

Modules/Visualization/Monteverdi/include/mvdApplication.h

@@ -25,6 +25,7 @@
 //// Included at first position before any other ones.
 #include "ConfigureMonteverdi.h"
 
+#include "OTBMonteverdiExport.h"
 
 /*****************************************************************************/
 /* INCLUDE SECTION                                                           */
@@ -70,7 +71,7 @@ class OTBApplicationsModel;
  * \ingroup OTBMonteverdi
  *
  */
-class ITK_EXPORT Application
+class OTBMonteverdi_EXPORT Application
   : public I18nApplication
 {
 

Modules/Visualization/Monteverdi/include/mvdMainWindow.h

@@ -61,6 +61,7 @@
 //
 #include "mvdI18nMainWindow.h"
 
+#include "OTBMonteverdiExport.h"
 
 /*****************************************************************************/
 /* PRE-DECLARATION SECTION                                                   */
@@ -100,7 +101,7 @@ class MainWindow;
  *
  * \brief The application main-widow widget.
  */
-class ITK_EXPORT MainWindow
+class OTBMonteverdi_EXPORT MainWindow
   : public I18nMainWindow
 {
 

Modules/Visualization/Monteverdi/include/mvdPreferencesDialog.h

@@ -24,7 +24,7 @@
 //// Included at first position before any other ones.
 #include "ConfigureMonteverdi.h"
 
-
+#include "OTBMonteverdiExport.h"
 /*****************************************************************************/
 /* INCLUDE SECTION                                                           */
 
@@ -72,7 +72,7 @@ class PreferencesDialog;
  * \ingroup OTBMonteverdi
  *
  */
-class ITK_EXPORT PreferencesDialog :
+class OTBMonteverdi_EXPORT PreferencesDialog :
     public QDialog
 {
 

Modules/Visualization/Monteverdi/otb-module.cmake

@@ -3,6 +3,7 @@ set( DOCUMENTATION
   )
 
 otb_module( OTBMonteverdi
+  ENABLE_SHARED
   DEPENDS
     OTBMonteverdiCore
     OTBMonteverdiGUI

Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h

@@ -55,7 +55,6 @@
 #include "mvdTypes.h"
 #endif //tag=QT4-boost-compatibility
 
-
 /*****************************************************************************/
 /* PRE-DECLARATION SECTION                                                   */
 
@@ -81,7 +80,7 @@ class QuicklookModel;
  * \ingroup OTBMonteverdiCore
  *
  */
-class ITK_EXPORT AbstractImageModel :
+class OTBMonteverdiCore_EXPORT AbstractImageModel :
     public AbstractLayerModel
 {
 
@@ -232,7 +231,7 @@ public:
 
   /**
    * \return The estimated spacing of the native image at full resolution
-   * 
+   *
    */
   inline const SpacingType& GetEstimatedGroundSpacing() const;
 

Modules/Visualization/MonteverdiCore/include/mvdAbstractLayerModel.h

@@ -85,11 +85,11 @@ enum SpatialReferenceType
 
 /**
  */
-ITK_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::string & filename );
+OTBMonteverdiCore_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::string & filename );
 
 /**
  */
-ITK_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::string & wkt, bool hasKwl );
+OTBMonteverdiCore_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::string & wkt, bool hasKwl );
 
 /*****************************************************************************/
 /* CLASS DEFINITION SECTION                                                  */
@@ -101,7 +101,7 @@ ITK_EXPORT SpatialReferenceType GetSpatialReferenceType( const std::string & wkt
  *
  * \brief WIP.
  */
-class ITK_EXPORT AbstractLayerModel :
+class OTBMonteverdiCore_EXPORT AbstractLayerModel :
     public AbstractModel,
     public VisibleInterface
 {

Modules/Visualization/MonteverdiCore/include/mvdAbstractModel.h

@@ -75,7 +75,7 @@ namespace mvd
  * \ingroup OTBMonteverdiCore
  *
  */
-class ITK_EXPORT AbstractModel :
+class OTBMonteverdiCore_EXPORT AbstractModel :
     public QObject
 {
 

Modules/Visualization/MonteverdiCore/include/mvdAbstractWorker.h

@@ -73,7 +73,7 @@ namespace mvd
  *
  * \brief Abstract worker object used as a base-class for threaded tasks.
  */
-class ITK_EXPORT AbstractWorker :
+class OTBMonteverdiCore_EXPORT AbstractWorker :
     public QObject
 {
 
@@ -153,7 +153,7 @@ signals:
   /**
    * \brief Signal emitted when an exception has been caught by this worker.
    *
-   * \param 
+   * \param
    */
   void ExceptionRaised( QString what );
 

Modules/Visualization/MonteverdiCore/include/mvdApplicationsBrowser.h

@@ -74,11 +74,11 @@ namespace mvd
  * \ingroup OTBMonteverdiCore
  *
  * \brief Search for available applications in a directory.
- * 
+ *
  * This class provides the functionnalities to look for
  * otbWrapperApplication apps in a given directory. The method used to
  * set the directory is SetAutoLoadPath(const std::string &).
- * 
+ *
  * If applications are available in the directory set by the user,
  * tags of each application are extracted.
  *
@@ -88,7 +88,7 @@ namespace mvd
  * signal.
  *
  */
-class ITK_EXPORT ApplicationsBrowser :
+class OTBMonteverdiCore_EXPORT ApplicationsBrowser :
     public QObject
 {
 
@@ -120,10 +120,10 @@ public:
   StringVector GetApplicationTags(const std::string& appName);
 
   /** return std::map storing tag/apps association for all the
-    * applications in the search path 
+    * applications in the search path
     */
   void SearchAvailableApplicationsTags();
- 
+
 
   /*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
 
@@ -136,7 +136,7 @@ public slots:
 //
 // Signals.
 signals:
-  void AvailableApplicationsTagsChanged(const ApplicationsTagContainer &, 
+  void AvailableApplicationsTagsChanged(const ApplicationsTagContainer &,
                                         const ApplicationDocNameToNameMap &);
 
   /*-[ PROTECTED SECTION ]---------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdBackgroundTask.h

@@ -73,7 +73,7 @@ class AbstractWorker;
  *
  * \brief WIP.
  */
-class ITK_EXPORT BackgroundTask :
+class OTBMonteverdiCore_EXPORT BackgroundTask :
     public QThread
 {
 

Modules/Visualization/MonteverdiCore/include/mvdCore.h

@@ -96,7 +96,7 @@ enum RgbwChannel
 /**
  * Constant naming video-channels.
  */
-extern ITK_EXPORT
+extern OTBMonteverdiCore_EXPORT
 const char*
 RGBW_CHANNEL_NAMES[ RGBW_CHANNEL_COUNT ];
 
@@ -137,7 +137,7 @@ enum Effect
 /**
  * Constant naming effect values.
  */
-ITK_EXPORT
+OTBMonteverdiCore_EXPORT
 extern
 char const * const
 EFFECT_NAMES[ EFFECT_COUNT ];

Modules/Visualization/MonteverdiCore/include/mvdFilenameInterface.h

@@ -73,7 +73,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class ITK_EXPORT FilenameInterface
+class OTBMonteverdiCore_EXPORT FilenameInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h

@@ -89,7 +89,7 @@ class AbstractImageModel;
  *
  * \ingroup OTBMonteverdiCore
  */
-class ITK_EXPORT HistogramModel :
+class OTBMonteverdiCore_EXPORT HistogramModel :
     public AbstractModel,
     private SerializableInterface
 {
@@ -605,7 +605,7 @@ HistogramModel
 	// qDebug() << "#" << i << ":" << sigma;
 
 	assert( sigma >= 0.0 );
-     
+
 	if( sigma<=0.0 )
 	  {
 	  bins[ i ] = 1;

Modules/Visualization/MonteverdiCore/include/mvdI18nCoreApplication.h

@@ -81,7 +81,7 @@ class VectorImageModel;
  *
  * \brief The MVD2 core-application (which is different from
  * QCoreApplication).
- * 
+ *
  * I18nCoreApplication do not derive from QCoreApplication to
  * prevent a dread diamong multiple inheritance scheme which could not
  * be resolved using virtual inheritance (because Qt is not designed
@@ -99,7 +99,7 @@ class VectorImageModel;
  * for example, provide sessio management), the specialized instance
  * can be passed as argument of constructor.
  */
-class ITK_EXPORT I18nCoreApplication
+class OTBMonteverdiCore_EXPORT I18nCoreApplication
   : public QObject
 {
 
@@ -210,7 +210,7 @@ public:
 
   /**
    * \brief setup elevation management
-   * 
+   *
    */
   bool ElevationSetup();
 
@@ -481,12 +481,12 @@ private:
 
   /**
   * \brief Directory where all result files from OTB applications are
-  * stored 
+  * stored
   */
   QDir m_ResultsDir;
 
   /**
-   * \brief Application settings 
+   * \brief Application settings
    */
   QSettings * m_Settings;
 

Modules/Visualization/MonteverdiCore/include/mvdImageImporter.h

@@ -75,7 +75,7 @@ namespace mvd
  * \brief Import image worker. It is parametrized by the image
  * filename and the desired (width, height) best-fit size.
  */
-class ITK_EXPORT ImageImporter :
+class OTBMonteverdiCore_EXPORT ImageImporter :
     public AbstractWorker
 {
 

Modules/Visualization/MonteverdiCore/include/mvdImagePlacenameLoader.h

@@ -65,17 +65,17 @@ class VectorImageModel;
  *
  * \ingroup OTBMonteverdiCore
  *
- * \brief 
+ * \brief
  *
  */
-class ImagePlacenameLoader : public QObject
+class OTBMonteverdiCore_EXPORT ImagePlacenameLoader : public QObject
 {
     Q_OBJECT;
 
 public:
   /** \brief Constructor */
   ImagePlacenameLoader(VectorImageModel* model);
-    
+
 public slots:
   /** \brief load the placename */
   void LoadPlacename();
@@ -86,12 +86,12 @@ signals:
 
   /** \brief Triggered when processing is finished */
   void Finished();
-  
+
 private:
 
   VectorImageModel* m_Model;
 };
-  
+
 } // end namespace 'mvd'
 
 #endif // __mvdImageModel_h

Modules/Visualization/MonteverdiCore/include/mvdImageProperties.h

@@ -77,7 +77,7 @@ namespace mvd
  * \brief WIP.
  */
 #define IMAGE_PROPERTIES_IS_QOBJECT 0
-class ITK_EXPORT ImageProperties
+class OTBMonteverdiCore_EXPORT ImageProperties
 #if IMAGE_PROPERTIES_IS_QOBJECT
   : public QObject
 #endif

Modules/Visualization/MonteverdiCore/include/mvdImageSettings.h

@@ -73,7 +73,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class ITK_EXPORT ImageSettings
+class OTBMonteverdiCore_EXPORT ImageSettings
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdImageSettingsInterface.h

@@ -72,7 +72,7 @@ class ImageSettings;
  *
  * \brief WIP.
  */
-class ITK_EXPORT ImageSettingsInterface
+class OTBMonteverdiCore_EXPORT ImageSettingsInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdModifiableInterface.h

@@ -71,7 +71,7 @@ namespace mvd
  * \ingroup OTBMonteverdiCore
  *
  */
-class ITK_EXPORT ModifiableInterface
+class OTBMonteverdiCore_EXPORT ModifiableInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdMyClass.h

@@ -73,7 +73,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class ITK_EXPORT MyClass :
+class OTBMonteverdiCore_EXPORT MyClass :
     public QObject
 {
 

Modules/Visualization/MonteverdiCore/include/mvdOverviewBuilder.h

@@ -77,7 +77,7 @@ namespace mvd
  * \brief Import image worker. It is parametrized by the image
  * filename and the desired (width, height) best-fit size.
  */
-class ITK_EXPORT OverviewBuilder :
+class OTBMonteverdiCore_EXPORT OverviewBuilder :
     public AbstractWorker,
     public ProgressInterface
 {

Modules/Visualization/MonteverdiCore/include/mvdProcessObjectObserver.h

@@ -74,7 +74,7 @@ class ProgressInterface;
  *
  * \brief WIP.
  */
-class ITK_EXPORT ProcessObjectObserver :
+class OTBMonteverdiCore_EXPORT ProcessObjectObserver :
     public itk::Command
 {
 

Modules/Visualization/MonteverdiCore/include/mvdProgressInterface.h

@@ -72,7 +72,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class ITK_EXPORT ProgressInterface
+class OTBMonteverdiCore_EXPORT ProgressInterface
 {
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/
 

Modules/Visualization/MonteverdiCore/include/mvdQuicklookModel.h

@@ -76,7 +76,7 @@ namespace mvd
  * \ingroup OTBMonteverdiCore
  *
  */
-class ITK_EXPORT QuicklookModel :
+class OTBMonteverdiCore_EXPORT QuicklookModel :
     public VectorImageModel
 {
 

Modules/Visualization/MonteverdiCore/include/mvdSerializableInterface.h

@@ -74,7 +74,7 @@ namespace mvd
  *
  * \brief 'Template method' pattern applied to serializable objects.
  */
-class ITK_EXPORT SerializableInterface
+class OTBMonteverdiCore_EXPORT SerializableInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h

@@ -76,7 +76,7 @@ class AbstractLayerModel;
  *
  * \brief WIP.
  */
-class ITK_EXPORT StackedLayerModel :
+class OTBMonteverdiCore_EXPORT StackedLayerModel :
     public AbstractModel
 {
 
@@ -306,7 +306,7 @@ private:
   // Usually, information is a singular term which denotes a
   // plural. Since there's a container of several pixel-infos and we
   // usually name container variables by using the plural form, an 's'
-  // is appended to PixelInfo. 
+  // is appended to PixelInfo.
   PixelInfo::Vector m_PixelInfos;
 
   /*-[ PRIVATE SLOTS SECTION ]-----------------------------------------------*/
@@ -540,7 +540,7 @@ StackedLayerModel
   return
     it==m_LayerModels.end()
     ? NULL
-    : it->second;  
+    : it->second;
 }
 
 /*****************************************************************************/

Modules/Visualization/MonteverdiCore/include/mvdSystemError.h

@@ -77,7 +77,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class ITK_EXPORT SystemError :
+class OTBMonteverdiCore_EXPORT SystemError :
     public std::runtime_error
 {
 
@@ -89,7 +89,7 @@ public:
 
   /** \brief Constructor. */
   SystemError( const std::string& message =std::string() ) :
-    std::runtime_error( itksys::SystemTools::GetLastSystemError() 
+    std::runtime_error( itksys::SystemTools::GetLastSystemError()
         + ": " + message) {};
 
   /** \brief Destructor. */

Modules/Visualization/MonteverdiCore/include/mvdVectorImageModel.h

@@ -84,7 +84,7 @@ class DatasetModel;
  * \ingroup OTBMonteverdiCore
  *
  */
-class ITK_EXPORT VectorImageModel :
+class OTBMonteverdiCore_EXPORT VectorImageModel :
     public AbstractImageModel,
     public FilenameInterface
 {
@@ -160,7 +160,7 @@ public:
   //
   // AbstractImageModel overrides.
 
-  /** 
+  /**
    * Get the number of available LOD.
    */
   virtual CountType GetNbLod() const;
@@ -227,7 +227,7 @@ signals:
   void CurrentPhysicalUpdated(const QStringList&);
   void CurrentGeographicUpdated(const QStringList&);
   void CurrentRadioUpdated(const QString&);
-  void CurrentPixelValueUpdated(const VectorImageType::PixelType &, 
+  void CurrentPixelValueUpdated(const VectorImageType::PixelType &,
                                 const QStringList& );
 
   /*-[ PROTECTED SECTION ]---------------------------------------------------*/
@@ -273,7 +273,7 @@ private:
     Closest( double invZoomfactor,
              unsigned int lodCount );
 
-  /** 
+  /**
     * helper to setup the lod image using a width/height or a zoom factor
     */
   void SetupCurrentLodImage(int w, int h);
@@ -316,7 +316,7 @@ private:
   /** List of all Level of detail (Resolution) available from the file */
   CountType m_LodCount;
 
-  //  Generic RS Transform to get lat/long coordinates 
+  //  Generic RS Transform to get lat/long coordinates
   otb::GenericRSTransform<>::Pointer m_ToWgs84;
 
   /*-[ PRIVATE SLOTS SECTION ]-----------------------------------------------*/

Modules/Visualization/MonteverdiCore/include/mvdVectorImageSettings.h

@@ -76,7 +76,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class ITK_EXPORT VectorImageSettings :
+class OTBMonteverdiCore_EXPORT VectorImageSettings :
     public ImageSettings
 {
 

Modules/Visualization/MonteverdiCore/include/mvdVisibleInterface.h

@@ -72,7 +72,7 @@ namespace mvd
  *
  * \brief WIP.
  */
-class ITK_EXPORT VisibleInterface
+class OTBMonteverdiCore_EXPORT VisibleInterface
 {
 
   /*-[ PUBLIC SECTION ]------------------------------------------------------*/

Modules/Visualization/MonteverdiCore/otb-module.cmake

@@ -3,6 +3,7 @@ set(DOCUMENTATION
   )
 
 otb_module( OTBMonteverdiCore
+  ENABLE_SHARED
   DEPENDS
     OTBCarto
     OTBCommon
@@ -20,7 +21,7 @@ otb_module( OTBMonteverdiCore
 
   OPTIONAL_DEPENDS
     OTBApplicationEngine
-  
+
   DESCRIPTION
   "${DOCUMENTATION}"
   )

Modules/Visualization/MonteverdiCore/src/ConfigureMonteverdi.h.in

@@ -126,6 +126,9 @@
 #include "otbConfigure.h"
 #include "otbMacro.h"
 
+#include "OTBMonteverdiGUIExport.h"
+#include "OTBMonteverdiCoreExport.h"
+
 //
 // Options
 

Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h

@@ -62,7 +62,7 @@ class AboutDialog;