WSL/SLF GitLab Repository

Commit 9e92bae3 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

Some POPC adjustments

parent 2fe2e97d
......@@ -118,8 +118,7 @@ METEOIO_OBJ = $(SRCDIR)/IOManager.o \
$(SRCDIR)/meteolaws/Suntrajectory.o \
$(SRCDIR)/meteolaws/Sun.o
METEOIO_OBJ_POPC = $(SRCDIR)/IOHandler.stub.o \
$(SRCDIR)/marshal_meteoio_par.o \
METEOIO_OBJ_POPC = $(SRCDIR)/marshal_meteoio_par.o \
$(SRCDIR)/IOManager_par.o \
$(SRCDIR)/Matrix_par.o \
$(SRCDIR)/IOPlugin_par.o \
......@@ -202,7 +201,7 @@ build_dynamiclibs_par: $(LIBDIR)/plugins/libarciopopc.so \
$(LIBDIR)/plugins/libimisiopopc.so \
$(LIBDIR)/plugins/libgrassiopopc.so
meteoIO_module_par: $(LIBDIR)/meteoio.module
meteoIO_module_par: #$(LIBDIR)/meteoio.module
############## END ##############
clean:
......@@ -230,7 +229,7 @@ install:
cp ${SRCDIR}/meteolaws/*.h @includedir@/meteoio/meteolaws
-cp lib/libmeteoio* @libdir@
-cp lib/plugins/*.so @libdir@/meteoio/plugins
-cp lib/*.module @libdir@/meteoio
#-cp lib/*.module @libdir@/meteoio
documentation:
doxygen $(SRCDIR)/config.dox
......
......@@ -78,13 +78,13 @@ Date::Date(const time_t& in_time, const bool& in_dst) {
dst = false;
setDate(in_time, in_dst);
}
//HACK: is it needed? Why paroc_base instead of POPC??
/**
* @brief Copy constructor.
* @param in_date Date object to copy
*/
#ifdef _POPC_
Date::Date(const Date& in_date) : pop_base() //HACK: do we really need this inheritance?
Date::Date(const Date& in_date) : paroc_base()
#else
Date::Date(const Date& in_date)
#endif
......
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