Changeset 12838


Ignore:
Timestamp:
07/31/12 11:12:06 (13 years ago)
Author:
Eric.Larour
Message:

BUG: added dakota include path to mex and python compile

Location:
issm/trunk-jpl
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/configs/config-macosx64-larour.sh

    r12157 r12838  
    2424        --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
    2525        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
    26         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/
    27         #--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
     26        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
     27        --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install

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

    r12611 r12838  
    1 INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
     1INCLUDES = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
    22EXEEXT=$(MATLABWRAPPEREXT)
    33#Bin programs {{{1

  • issm/trunk-jpl/src/modules/python/Makefile.am

    r12592 r12838  
    1 INCLUDES = @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
     1INCLUDES = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
    22EXEEXT=$(PYTHONWRAPPEREXT)
    33#Bin programs {{{1
Note: See TracChangeset for help on using the changeset viewer.