Skip to content
Snippets Groups Projects
Commit 85067d18 authored by Julien Malik's avatar Julien Malik
Browse files

COMP: fix some configuration error introduced previously

parent 1d2b2852
No related branches found
No related tags found
No related merge requests found
...@@ -100,13 +100,16 @@ private: ...@@ -100,13 +100,16 @@ private:
} //end namespace otb } //end namespace otb
#define OTB_APPLICATION_REGISTER( ApplicationType ) \ #define OTB_APPLICATION_EXPORT( ApplicationType ) \
typedef otb::Wrapper::ApplicationFactory<ApplicationType> ApplicationFactoryType; \ typedef otb::Wrapper::ApplicationFactory<ApplicationType> ApplicationFactoryType; \
static ApplicationFactoryType::Pointer staticFactory; \ static ApplicationFactoryType::Pointer staticFactory; \
itk::ObjectFactoryBase* itkLoad() \ extern "C" \
{ \ { \
staticFactory = ApplicationFactoryType::New(); \ itk::ObjectFactoryBase* itkLoad() \
return staticFactory; \ { \
staticFactory = ApplicationFactoryType::New(); \
return staticFactory; \
} \
} }
......
...@@ -72,4 +72,4 @@ private: ...@@ -72,4 +72,4 @@ private:
} }
} }
OTB_APPLICATION_REGISTER(otb::Wrapper::Addition) OTB_APPLICATION_EXPORT(otb::Wrapper::Addition)
...@@ -168,5 +168,5 @@ private: ...@@ -168,5 +168,5 @@ private:
} }
} }
OTB_APPLICATION_REGISTER(otb::Wrapper::Smoothing) OTB_APPLICATION_EXPORT(otb::Wrapper::Smoothing)
...@@ -55,8 +55,8 @@ ADD_TEST(owTuApplication ${OTB_WRAPPER_TESTS} ...@@ -55,8 +55,8 @@ ADD_TEST(owTuApplication ${OTB_WRAPPER_TESTS}
) )
# Application class test # Application class test
ADD_TEST(owTvApplicationFactory ${OTB_WRAPPER_TESTS} ADD_TEST(owTvApplicationRegistry ${OTB_WRAPPER_TESTS}
otbWrapperApplicationFactory otbWrapperApplicationRegistry
) )
# ----------------Source files CXX ----------------------------------- # ----------------Source files CXX -----------------------------------
......
...@@ -4,9 +4,10 @@ FIND_PROGRAM(OTB_TEST_DRIVER otbTestDriver PATHS ${OTB_DIR}/bin ${OTB_DIR}/../.. ...@@ -4,9 +4,10 @@ FIND_PROGRAM(OTB_TEST_DRIVER otbTestDriver PATHS ${OTB_DIR}/bin ${OTB_DIR}/../..
SET(TEST_DRIVER "${OTB_TEST_DRIVER}" SET(TEST_DRIVER "${OTB_TEST_DRIVER}"
--add-before-env PYTHONPATH "${CMAKE_BINARY_DIR}/Code/Wrappers/SWIG" --add-before-env PYTHONPATH "${CMAKE_BINARY_DIR}/Code/Wrappers/SWIG"
--add-before-env ITK_AUTOLOAD_PATH "${CMAKE_BINARY_DIR}/Example/Smoothing" --add-before-env ITK_AUTOLOAD_PATH "${CMAKE_BINARY_DIR}/Example"
) )
SET(TEMP ${OTBWrapper_BINARY_DIR}/Temporary) SET(TEMP ${CMAKE_BINARY_DIR}/Testing/Temporary)
FILE(MAKE_DIRECTORY ${TEMP})
ADD_TEST( NAME PythonTest1 ADD_TEST( NAME PythonTest1
COMMAND ${TEST_DRIVER} Execute COMMAND ${TEST_DRIVER} Execute
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment