Changeset 12585


Ignore:
Timestamp:
06/29/12 11:08:01 (13 years ago)
Author:
utke
Message:

drop the extraneous part of the include path and do the include properly with the adolc directory prefixed.
With this changeset the issm.exe compiles/links without errors using --with-adolc-dir in the configure

Location:
issm/trunk-jpl
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/m4/issm_options.m4

    r12568 r12585  
    429429                        dnl defaults
    430430                        HAVE_ADOLC=yes
    431                         ADOLCINCL="-I$ADOLC_ROOT/include/adolc -I$ADOLC_ROOT/include"
     431                        ADOLCINCL="-I$ADOLC_ROOT/include"
    432432                        ADOLCLIB="-L$ADOLC_ROOT/lib64 -ladolc"
    433433

  • issm/trunk-jpl/src/c/include/types.h

    r12478 r12585  
    2828
    2929#ifdef _HAVE_ADOLC_
    30 #include "adolc.h"
     30#include "adolc/adolc.h"
    3131// for active variables
    3232typedef adouble IssmDouble;
Note: See TracChangeset for help on using the changeset viewer.