Commit 902c2124 authored by Rashad Kanavath's avatar Rashad Kanavath

COMP: support shared lib with msvc(Modules\Wrappers)

parent a80875a2
......@@ -20,6 +20,7 @@
#include "itkEventObject.h"
#include "itkProcessObject.h"
#include "OTBApplicationEngineExport.h"
namespace otb
{
......@@ -33,7 +34,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT AddProcessToWatchEvent: public itk::EventObject
class OTBApplicationEngine_EXPORT AddProcessToWatchEvent: public itk::EventObject
{
public:
......
......@@ -31,6 +31,7 @@
#include "otbWrapperComplexOutputImageParameter.h"
#include "otbWrapperDocExampleStructure.h"
#include "itkMersenneTwisterRandomVariateGenerator.h"
#include "OTBApplicationEngineExport.h"
namespace otb
{
......@@ -44,7 +45,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT Application: public itk::Object
class OTBApplicationEngine_EXPORT Application: public itk::Object
{
public:
/** Standard class typedefs. */
......
......@@ -18,6 +18,7 @@
#ifndef otbWrapperApplicationFactoryBase_h
#define otbWrapperApplicationFactoryBase_h
#include "OTBApplicationEngineExport.h"
#include "itkObjectFactoryBase.h"
#include "otbWrapperApplication.h"
......@@ -26,7 +27,7 @@ namespace otb
namespace Wrapper
{
class ITK_ABI_EXPORT ApplicationFactoryBase : public itk::ObjectFactoryBase
class OTBApplicationEngine_EXPORT ApplicationFactoryBase : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
......
......@@ -31,7 +31,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT ApplicationHtmlDocGenerator
class OTBApplicationEngine_EXPORT ApplicationHtmlDocGenerator
{
public:
/** Standard class typedef */
......
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT ApplicationRegistry : public itk::Object
class OTBApplicationEngine_EXPORT ApplicationRegistry : public itk::Object
{
public:
/** Standard class typedefs. */
......
......@@ -33,7 +33,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT ChoiceParameter
class OTBApplicationEngine_EXPORT ChoiceParameter
: public Parameter
{
public:
......
......@@ -32,7 +32,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT ComplexInputImageParameter : public Parameter
class OTBApplicationEngine_EXPORT ComplexInputImageParameter : public Parameter
{
public:
/** Standard class typedef */
......
......@@ -32,7 +32,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT ComplexOutputImageParameter : public Parameter
class OTBApplicationEngine_EXPORT ComplexOutputImageParameter : public Parameter
{
public:
/** Standard class typedef */
......
......@@ -33,7 +33,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT DirectoryParameter
class OTBApplicationEngine_EXPORT DirectoryParameter
: public Parameter
{
public:
......
......@@ -26,7 +26,7 @@
#include <vector>
#include "otbConfigure.h"
#include "itkFixedArray.h"
#include "OTBApplicationEngineExport.h"
namespace otb
{
......@@ -42,7 +42,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT DocExampleStructure :
class OTBApplicationEngine_EXPORT DocExampleStructure :
public itk::Object
{
public:
......
......@@ -47,16 +47,16 @@ public:
* Add a Group containing several choices for map projections
*
*/
static ITK_ABI_EXPORT void AddElevationParameters(Application::Pointer app, const std::string & key);
static OTBApplicationEngine_EXPORT void AddElevationParameters(Application::Pointer app, const std::string & key);
/** Method for getting the value of the elevation mode selected */
static ITK_ABI_EXPORT float GetDefaultElevation(const Application::Pointer app, const std::string& key);
static ITK_ABI_EXPORT const std::string GetGeoidFile(const Application::Pointer app, const std::string& key);
static ITK_ABI_EXPORT const std::string GetDEMDirectory(const Application::Pointer app, const std::string& key);
static ITK_ABI_EXPORT bool IsGeoidUsed(const Application::Pointer app, const std::string& key);
static ITK_ABI_EXPORT bool IsDEMUsed(const Application::Pointer app, const std::string & key);
static OTBApplicationEngine_EXPORT float GetDefaultElevation(const Application::Pointer app, const std::string& key);
static OTBApplicationEngine_EXPORT const std::string GetGeoidFile(const Application::Pointer app, const std::string& key);
static OTBApplicationEngine_EXPORT const std::string GetDEMDirectory(const Application::Pointer app, const std::string& key);
static OTBApplicationEngine_EXPORT bool IsGeoidUsed(const Application::Pointer app, const std::string& key);
static OTBApplicationEngine_EXPORT bool IsDEMUsed(const Application::Pointer app, const std::string & key);
static ITK_ABI_EXPORT void SetupDEMHandlerFromElevationParameters(const Application::Pointer app, const std::string& key);
static OTBApplicationEngine_EXPORT void SetupDEMHandlerFromElevationParameters(const Application::Pointer app, const std::string& key);
protected:
ElevationParametersHandler(); // not implemented
......
......@@ -30,7 +30,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT EmptyParameter
class OTBApplicationEngine_EXPORT EmptyParameter
: public Parameter
{
public:
......
......@@ -33,7 +33,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT InputFilenameListParameter : public Parameter
class OTBApplicationEngine_EXPORT InputFilenameListParameter : public Parameter
{
public:
/** Standard class typedef */
......
......@@ -31,7 +31,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT InputFilenameParameter
class OTBApplicationEngine_EXPORT InputFilenameParameter
: public Parameter
{
public:
......
......@@ -33,7 +33,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT InputImageListParameter : public Parameter
class OTBApplicationEngine_EXPORT InputImageListParameter : public Parameter
{
public:
/** Standard class typedef */
......
......@@ -32,7 +32,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT InputImageParameter : public Parameter
class OTBApplicationEngine_EXPORT InputImageParameter : public Parameter
{
public:
/** Standard class typedef */
......@@ -92,7 +92,7 @@ public:
/** Generic cast method that will be specified for each image type. */
template <class TInputImage, class TOutputImage>
ITK_ABI_EXPORT TOutputImage* CastImage();
TOutputImage* CastImage();
/** Cast an image to an image of the same type
* Image to Image, VectorImage to VectorImage, RGBAImage to RGBAImage. */
......@@ -162,7 +162,7 @@ private:
// so that the linker knows they exist when building OTB Applications
#define otbDeclareCastImageMacro(InputImageType, OutputImageType) \
template<> OutputImageType * \
template<> OTBApplicationEngine_EXPORT OutputImageType * \
InputImageParameter::CastImage<InputImageType , OutputImageType>(); \
#define otbGenericDeclareCastImageMacro(InputImageType, prefix) \
......
......@@ -14,7 +14,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT InputProcessXMLParameter
class OTBApplicationEngine_EXPORT InputProcessXMLParameter
: public Parameter
{
public:
......
......@@ -33,7 +33,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT InputVectorDataListParameter : public Parameter
class OTBApplicationEngine_EXPORT InputVectorDataListParameter : public Parameter
{
public:
/** Standard class typedef */
......
......@@ -31,7 +31,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT InputVectorDataParameter : public Parameter
class OTBApplicationEngine_EXPORT InputVectorDataParameter : public Parameter
{
public:
/** Standard class typedef */
......
......@@ -34,7 +34,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT ListViewParameter
class OTBApplicationEngine_EXPORT ListViewParameter
: public Parameter
{
public:
......
......@@ -18,6 +18,8 @@
#ifndef otbWrapperMapProjectionParametersHandler_h
#define otbWrapperMapProjectionParametersHandler_h
#include "OTBApplicationEngineExport.h"
#include "otbWrapperApplication.h"
namespace otb
......@@ -52,14 +54,14 @@ public:
* Add a Group containing several choices for map projections
*
*/
static ITK_ABI_EXPORT void AddMapProjectionParameters(Application::Pointer app, const std::string & key);
static OTBApplicationEngine_EXPORT void AddMapProjectionParameters(Application::Pointer app, const std::string & key);
/**
* Helper method : Compute the ProjectionRef knowing the map
* projection picked up by the user
*
*/
static ITK_ABI_EXPORT const std::string GetProjectionRefFromChoice(const Application::Pointer app,
static OTBApplicationEngine_EXPORT const std::string GetProjectionRefFromChoice(const Application::Pointer app,
const std::string & key);
......@@ -69,7 +71,7 @@ public:
* The key must be totally if the InputImageParameter belongs
* to a ParamaterGroup, ie set io.in
*/
static ITK_ABI_EXPORT void InitializeUTMParameters(Application::Pointer app,
static OTBApplicationEngine_EXPORT void InitializeUTMParameters(Application::Pointer app,
const std::string & imageKey,
const std::string & mapKey );
......
......@@ -31,7 +31,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT OutputFilenameParameter
class OTBApplicationEngine_EXPORT OutputFilenameParameter
: public Parameter
{
public:
......
......@@ -33,7 +33,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT OutputImageParameter : public Parameter
class OTBApplicationEngine_EXPORT OutputImageParameter : public Parameter
{
public:
/** Standard class typedef */
......
......@@ -13,7 +13,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT OutputProcessXMLParameter
class OTBApplicationEngine_EXPORT OutputProcessXMLParameter
: public Parameter
{
public:
......
......@@ -33,7 +33,7 @@ namespace Wrapper
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT OutputVectorDataParameter : public Parameter
class OTBApplicationEngine_EXPORT OutputVectorDataParameter : public Parameter
{
public:
/** Standard class typedef */
......
......@@ -22,6 +22,7 @@
#include "itkObjectFactory.h"
#include "otbWrapperTypes.h"
#include "OTBApplicationEngineExport.h"
namespace otb
{
......@@ -56,7 +57,7 @@ enum DefaultValueMode
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT Parameter
class OTBApplicationEngine_EXPORT Parameter
: public itk::Object
{
public:
......
......@@ -32,7 +32,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT ParameterGroup
class OTBApplicationEngine_EXPORT ParameterGroup
: public Parameter
{
public:
......
......@@ -23,6 +23,7 @@
#include <ostream>
#include <itksys/RegularExpression.hxx>
#include "itkMacro.h"
#include "OTBApplicationEngineExport.h"
namespace otb
{
......@@ -37,7 +38,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT ParameterKey
class OTBApplicationEngine_EXPORT ParameterKey
{
public:
......
......@@ -30,7 +30,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT RAMParameter : public Parameter
class OTBApplicationEngine_EXPORT RAMParameter : public Parameter
{
public:
/** Standard class typedef */
......
......@@ -30,7 +30,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT RadiusParameter
class OTBApplicationEngine_EXPORT RadiusParameter
: public IntParameter
{
public:
......
......@@ -31,7 +31,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT StringListParameter
class OTBApplicationEngine_EXPORT StringListParameter
: public Parameter
{
public:
......
......@@ -31,7 +31,7 @@ namespace Wrapper
*
* \ingroup OTBApplicationEngine
*/
class ITK_ABI_EXPORT StringParameter
class OTBApplicationEngine_EXPORT StringParameter
: public Parameter
{
public:
......
......@@ -2,6 +2,7 @@ set(DOCUMENTATION "This module contains classes that ease the implementation of
applications (see chapter 'How to write an application' of the SoftwareGuide).")
otb_module(OTBApplicationEngine
ENABLE_SHARED
DEPENDS
OTBVectorDataBase
OTBImageIO
......
......@@ -21,10 +21,11 @@
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "itkCommand.h"
#endif //tag=QT4-boost-compatibility
#include "OTBQtWidgetExport.h"
namespace itk {
class ITK_ABI_EXPORT QtProgressBar : public ::QProgressBar
class OTBQtWidget_EXPORT QtProgressBar : public ::QProgressBar
{
Q_OBJECT
public:
......
......@@ -24,11 +24,13 @@
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "itkMacro.h"
#endif //tag=QT4-boost-compatibility
#include "OTBQtWidgetExport.h"
namespace otb
{
namespace Wrapper
{
class ITK_ABI_EXPORT QtApplication : public QApplication
class OTBQtWidget_EXPORT QtApplication : public QApplication
{
Q_OBJECT
......
......@@ -25,6 +25,7 @@
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
#include "OTBQtWidgetExport.h"
namespace otb
{
......@@ -36,7 +37,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtFileSelectionWidget : public QWidget
class OTBQtWidget_EXPORT QtFileSelectionWidget : public QWidget
{
Q_OBJECT
public:
......
......@@ -25,6 +25,8 @@
//#include "itkObjectFactory.h"
//#include "itkProcessObject.h"
#include "OTBQtWidgetExport.h"
namespace otb
{
......@@ -36,7 +38,7 @@ namespace otb
*
*/
class ITK_ABI_EXPORT QtLogOutput : public QObject, public itk::LogOutput
class OTBQtWidget_EXPORT QtLogOutput : public QObject, public itk::LogOutput
{
Q_OBJECT
public:
......
......@@ -23,7 +23,7 @@
#include "otbWrapperStringListParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
#endif //tag=QT4-boost-compatibility
#include "OTBQtWidgetExport.h"
namespace otb
{
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtStringSelectionWidget : public QWidget
class OTBQtWidget_EXPORT QtStringSelectionWidget : public QWidget
{
Q_OBJECT
......
......@@ -34,7 +34,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetChoiceParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetChoiceParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetComplexInputImageParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetComplexInputImageParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetComplexOutputImageParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetComplexOutputImageParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetDirectoryParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetDirectoryParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -34,7 +34,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetEmptyParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetEmptyParameter : public QtWidgetParameterBase
{
Q_OBJECT
......
......@@ -34,7 +34,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetFloatParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetFloatParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -33,7 +33,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetInputFilenameListParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetInputFilenameListParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetInputFilenameParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetInputFilenameParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -33,7 +33,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetInputImageListParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetInputImageListParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetInputImageParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetInputImageParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetInputProcessXMLParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetInputProcessXMLParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -34,7 +34,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetInputVectorDataListParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetInputVectorDataListParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/
class ITK_ABI_EXPORT QtWidgetInputVectorDataParameter : public QtWidgetParameterBase
class OTBQtWidget_EXPORT QtWidgetInputVectorDataParameter : public QtWidgetParameterBase
{
Q_OBJECT
public:
......
......@@ -35,7 +35,7 @@ namespace Wrapper
*
* \ingroup OTBQtWidget
*/