From 5b9fe54e8c1b0eb424a5607a2a0230b1f97eb542 Mon Sep 17 00:00:00 2001 From: Julien Malik <julien.malik@c-s.fr> Date: Tue, 9 Aug 2011 18:42:41 +0200 Subject: [PATCH] ENH: export access point for application in DLL on Windows --- Code/Core/otbWrapperApplicationFactory.h | 9 +++++++-- Testing/Python/CMakeLists.txt | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Code/Core/otbWrapperApplicationFactory.h b/Code/Core/otbWrapperApplicationFactory.h index 16ebfd0b6a..d20fd877ff 100644 --- a/Code/Core/otbWrapperApplicationFactory.h +++ b/Code/Core/otbWrapperApplicationFactory.h @@ -99,13 +99,18 @@ private: } // end namespace Wrapper } //end namespace otb +#if (defined(WIN32) || defined(_WIN32)) +# define OTB_APP_EXPORT __declspec(dllexport) +#else +# define OTB_APP_EXPORT +#endif -#define OTB_APPLICATION_EXPORT( ApplicationType ) \ +#define OTB_APPLICATION_EXPORT( ApplicationType ) \ typedef otb::Wrapper::ApplicationFactory<ApplicationType> ApplicationFactoryType; \ static ApplicationFactoryType::Pointer staticFactory; \ extern "C" \ { \ - itk::ObjectFactoryBase* itkLoad() \ + OTB_APP_EXPORT itk::ObjectFactoryBase* itkLoad() \ { \ staticFactory = ApplicationFactoryType::New(); \ return staticFactory; \ diff --git a/Testing/Python/CMakeLists.txt b/Testing/Python/CMakeLists.txt index 7b597d510b..9027fbfaab 100644 --- a/Testing/Python/CMakeLists.txt +++ b/Testing/Python/CMakeLists.txt @@ -14,4 +14,5 @@ add_test( NAME pyTvRescale COMMAND ${TEST_DRIVER} Execute ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/PythonRescaleTest.py ${OTB_DATA_ROOT}/Input/ToulouseExtract_WithGeom.tif - ${TEMP}/pyTvRescale) \ No newline at end of file + ${TEMP}/pyTvRescale) + \ No newline at end of file -- GitLab