WSL/SLF GitLab Repository

Commit 8b495379 authored by Thomas Egger's avatar Thomas Egger
Browse files

Adding correct header includes for BormaIO and CosmoXMLIO to IOHandler.

parent 2161ae7b
......@@ -77,9 +77,6 @@ namespace mio {
void IOHandler::registerPlugins()
{
//mapPlugins[io.ini KEY]= IOPlugin(library file name, class name, NULL, NULL);
#ifdef PLUGIN_SMETIO
mapPlugins["SMET"] = IOPlugin("SMETIO", NULL, &IOPlugin::createInstance<SMETIO>);
#endif
#ifdef PLUGIN_ARCIO
mapPlugins["ARC"] = IOPlugin("ARCIO", NULL, &IOPlugin::createInstance<ARCIO>);
#endif
......@@ -95,6 +92,9 @@ void IOHandler::registerPlugins()
#ifdef PLUGIN_GEOTOPIO
mapPlugins["GEOTOP"] = IOPlugin("GeotopIO", NULL, &IOPlugin::createInstance<GeotopIO>);
#endif
#ifdef PLUGIN_SMETIO
mapPlugins["SMET"] = IOPlugin("SMETIO", NULL, &IOPlugin::createInstance<SMETIO>);
#endif
#ifdef PLUGIN_SNIO
mapPlugins["SNOWPACK"] = IOPlugin("SNIO", NULL, &IOPlugin::createInstance<SNIO>);
#endif
......
......@@ -26,15 +26,23 @@
#include <meteoio/IOExceptions.h>
#include <meteoio/IOPlugin.h>
#include <meteoio/plugins/SMETIO.h>
#include <meteoio/plugins/ARCIO.h>
#include <meteoio/plugins/A3DIO.h>
#include <meteoio/plugins/ARPSIO.h>
#include <meteoio/plugins/GrassIO.h>
#include <meteoio/plugins/GeotopIO.h>
#include <meteoio/plugins/PGMIO.h>
#include <meteoio/plugins/SMETIO.h>
#include <meteoio/plugins/SNIO.h>
#ifdef PLUGIN_BORMAIO
#include <meteoio/plugins/BormaIO.h>
#endif
#ifdef PLUGIN_COSMOXMLIO
#include <meteoio/plugins/CosmoXMLIO.h>
#endif
#ifdef PLUGIN_IMISIO
#include <meteoio/plugins/ImisIO.h>
#endif
......@@ -43,14 +51,14 @@
#include <meteoio/plugins/GRIBIO.h>
#endif
#ifdef PLUGIN_PNGIO
#include <meteoio/plugins/PNGIO.h>
#endif
#ifdef PLUGIN_GSNIO
#include <meteoio/plugins/GSNIO.h>
#endif
#ifdef PLUGIN_PNGIO
#include <meteoio/plugins/PNGIO.h>
#endif
#include <map>
#include <string>
......@@ -60,8 +68,7 @@ namespace mio {
* @file IOHandler.h
* @class IOHandler
* @brief This class is the class to use for raw I/O operations. It is responsible for transparently loading the plugins
* and it follows the interface defined by the IOInterface class with the addition of
* a few convenience methods.
* and it follows the interface defined by the IOInterface class with the addition of a few convenience methods.
*/
#ifdef _POPC_
class IOHandler {
......
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/")
IF(PLUGIN_SMETIO)
IF(MSVC)
ADD_DEFINITIONS(/DPLUGIN_SMETIO) #it looks like some VC++ versions don't support -D syntax
ELSE(MSVC)
ADD_DEFINITIONS(-DPLUGIN_SMETIO)
ENDIF(MSVC)
SET(plugins_sources ${plugins_sources} plugins/SMETIO.cc)
ENDIF(PLUGIN_SMETIO)
IF(PLUGIN_ARCIO)
IF(MSVC)
ADD_DEFINITIONS(/DPLUGIN_ARCIO) #it looks like some VC++ versions don't support -D syntax
......@@ -151,6 +142,15 @@ IF(PLUGIN_PNGIO)
SET(plugins_sources ${plugins_sources} plugins/PNGIO.cc)
ENDIF(PLUGIN_PNGIO)
IF(PLUGIN_SMETIO)
IF(MSVC)
ADD_DEFINITIONS(/DPLUGIN_SMETIO) #it looks like some VC++ versions don't support -D syntax
ELSE(MSVC)
ADD_DEFINITIONS(-DPLUGIN_SMETIO)
ENDIF(MSVC)
SET(plugins_sources ${plugins_sources} plugins/SMETIO.cc)
ENDIF(PLUGIN_SMETIO)
IF(PLUGIN_SNIO)
IF(MSVC)
ADD_DEFINITIONS(/DPLUGIN_SNIO) #it looks like some VC++ versions don't support -D syntax
......
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