mirror of
https://github.com/nasa/trick.git
synced 2025-02-20 09:16:20 +00:00
Use udunits package for units conversions
Changed the include for udunits to #include <udunits2.h> to work on all platforms. Added the include directory /usr/include/udunits2 for Linux. refs #231
This commit is contained in:
parent
4f3ef64002
commit
6defa99b34
@ -2,7 +2,7 @@
|
||||
#ifndef UDUNITS_HH
|
||||
#define UDUNITS_HH
|
||||
|
||||
#include <udunits2/udunits2.h>
|
||||
#include <udunits2.h>
|
||||
#include <string>
|
||||
|
||||
namespace Trick {
|
||||
|
@ -7,7 +7,7 @@
|
||||
#define SWIG_INT_TEMPLATES_HH
|
||||
|
||||
#include "trick/UdUnits.hh"
|
||||
#include <udunits2/udunits2.h>
|
||||
#include <udunits2.h>
|
||||
|
||||
template< class S , typename T > static int convert_and_set( T & output , void * my_argp , std::string to_units ) {
|
||||
int ret = 0 ;
|
||||
|
@ -64,3 +64,6 @@ ifeq "" "c++11"
|
||||
TRICK_ADDITIONAL_CXXFLAGS += -std=c++11 -D_HAVE_STL_RANDOM
|
||||
endif
|
||||
|
||||
# Additional include directory for udunits.
|
||||
TRICK_ADDITIONAL_CXXFLAGS += -I/usr/include/udunits2
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <map>
|
||||
#include <stdint.h>
|
||||
|
||||
#include <udunits2/udunits2.h>
|
||||
#include <udunits2.h>
|
||||
|
||||
#include "ConstructValues.hh"
|
||||
#include "clang/Basic/Specifiers.h"
|
||||
|
@ -43,6 +43,7 @@ CXXFLAGS += -std=c++11
|
||||
# Fedora 21 adds -ledit as a system lib, but it isn't installed, or required.
|
||||
CLANGLIBS += $(filter-out -ledit,$(shell $(LLVM_HOME)/bin/llvm-config --system-libs))
|
||||
endif
|
||||
CXXFLAGS += -I/usr/include/udunits2
|
||||
endif
|
||||
|
||||
ifeq ($(TRICK_HOST_TYPE),Darwin)
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
#include <Python.h>
|
||||
#include <iostream>
|
||||
#include <udunits2/udunits2.h>
|
||||
#include <udunits2.h>
|
||||
|
||||
#include "trick/Unit.hh"
|
||||
#include "trick/UdUnits.hh"
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
%inline %{
|
||||
#include <frameobject.h>
|
||||
#include <udunits2/udunits2.h>
|
||||
#include <udunits2.h>
|
||||
#include "trick/swig/swig_double.hh"
|
||||
|
||||
std::string map_trick_units_to_udunits( std::string orig_units ) ;
|
||||
|
Loading…
x
Reference in New Issue
Block a user