Changeset 26415


Ignore:
Timestamp:
08/31/21 19:49:53 (4 years ago)
Author:
jdquinn
Message:

BUG: Fixes for PROJ on Jenkins macOS build node

Location:
issm/trunk-jpl/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/modules/CoordinateSystemTransformx/CoordinateSystemTransformx.cpp

    r26367 r26415  
    44
    55/*Header files*/
    6 #include <proj.h>
    7 
    86#include "./CoordinateSystemTransformx.h"
    97#include "../../shared/shared.h"
    108#include "../../toolkits/toolkits.h"
     9#include <proj.h>
    1110
    1211void CoordinateSystemTransformx(double** px_dest,double** py_dest,double* x_src,double* y_src,int size,const char* str_src,const char* str_dst){
    1312
    1413/*
    15         NOTE:
    16         - Compilation of this module is fenced in Makefile.am, so we do not
    17         have to check again if _HAVE_PROJ_ is defined
    18         - As of at least PROJ 8, version macros are defined,
    19 
    20                 https://proj.org/development/reference/macros.html
     14NOTE:
     15- Compilation of this module is fenced in Makefile.am, so we do not have to
     16check again if _HAVE_PROJ_ is defined
    2117*/
    22 #if !defined(PROJ_VERSION_MAJOR) || !PROJ_AT_LEAST_VERSION(8, 0, 0)
    23         _error_("PROJ major version >= 8 required");
    24 #else
     18#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR >= 6
    2519        /*
    2620        Converts an array of longitude (x_src) and array of latitude (y_src) in the
    … …  
    7670        *px_dest=x_dest;
    7771        *py_dest=y_dest;
     72#else
     73        _error_("PROJ version >= 6 required");
    7874#endif
    7975}

  • issm/trunk-jpl/src/wrappers/CoordTransform/CoordTransform.cpp

    r26368 r26415  
    44
    55/*Header files*/
     6#include "./CoordTransform.h"
    67#include <proj.h>
    78
    8 #include "./CoordTransform.h"
    9 
    109/*
    11         NOTE:
    12         - Compilation of this module is fenced in Makefile.am, so we do not
    13         have to check again if _HAVE_PROJ_ is defined
    14         - As of at least PROJ 8, version macros are defined,
    15 
    16                 https://proj.org/development/reference/macros.html
     10NOTE:
     11- Compilation of this module is fenced in Makefile.am, so we do not have to
     12check again if _HAVE_PROJ_ is defined
    1713*/
    18 #if !defined(PROJ_VERSION_MAJOR) || !PROJ_AT_LEAST_VERSION(8, 0, 0)
    19         _error_("PROJ major version >= 8 required");
    20 #else
     14#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR >= 6
    2115        /*
    2216        Converts an array of longitude (x_src) and array of latitude (y_src) in the
    … …  
    108102                MODULEEND();
    109103        }
    110 
     104#else
     105        _error_("PROJ version >= 6 required");
    111106#endif

  • issm/trunk-jpl/src/wrappers/matlab/Makefile.am

    r26385 r26415  
    194194ContourToNodes_matlab_la_LIBADD = ${deps}
    195195
     196if PROJ
    196197CoordTransform_matlab_la_SOURCES = ../CoordTransform/CoordTransform.cpp
    197198CoordTransform_matlab_la_LIBADD = ${deps}
     199endif
    198200
    199201DistanceToMaskBoundary_matlab_la_SOURCES = ../DistanceToMaskBoundary/DistanceToMaskBoundary.cpp
Note: See TracChangeset for help on using the changeset viewer.