Changeset 3664 for trunk/test_more


Ignore:
Timestamp:
Feb 24, 2015 9:28:15 AM (5 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 2e6c6d026df2f6a8089160e5994e7fdf47b28002
end hash code: 7becb1226eaa4331e996c2f61a7c3ac4cc25a27e

commit 7becb1226eaa4331e996c2f61a7c3ac4cc25a27e
Author: Brad Bell <bradbell@…>
Date: Tue Feb 24 07:20:13 2015 -0700

erf.sh: Remove this bug report (it that has been fixed).

commit 955b920f832c9d4bbada9735d8aed7ba4b2e5430
Author: Brad Bell <bradbell@…>
Date: Tue Feb 24 07:10:46 2015 -0700

Remove trailing white space.

commit b77fd1442d0a05cdfc10b833a9ccdfb4bb9c025b
Author: Brad Bell <bradbell@…>
Date: Tue Feb 24 07:09:03 2015 -0700

Automatically include cppad_colpack.cpp when colpack is available.

commit 447ea091c96773d0d75106783eb11da11d47a1ea
Author: Brad Bell <bradbell@…>
Date: Tue Feb 24 06:47:49 2015 -0700

Remove some bug reports that have been fixed.

commit 0aed02c9bb0abff26081405212f9d8799fcd975a
Author: Brad Bell <bradbell@…>
Date: Tue Feb 24 06:28:00 2015 -0700

colpack_prefix.omh: remove trailing white space.

commit 06a98561b0ba17d86a6fab98ec5f8dcbf86807b0
Author: Brad Bell <bradbell@…>
Date: Tue Feb 24 06:25:22 2015 -0700

cmake.omh: Add overall descriptions for optional package prefixes.
colpack_prefix.omh: fix link to ColPack? home page.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test_more/test_one.sh.in

    r3519 r3664  
    22# $Id$
    33# -----------------------------------------------------------------------------
    4 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     4# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    55#
    66# CppAD is distributed under multiple licenses. This distribution is under
    7 # the terms of the 
     7# the terms of the
    88#                     Eclipse Public License Version 1.0.
    99#
     
    3333sed < test_more.cpp > test_one.cpp \
    3434-e '/ok *\&= *Run( /d' \
    35 -e "s/.*This line is used by test_one.sh.*/     ok \&= Run( $fun, \"$fun\");/" 
     35-e "s/.*This line is used by test_one.sh.*/     ok \&= Run( $fun, \"$fun\");/"
    3636#
    3737#
     
    4242        cxxflags='-g -Wall -ansi -pedantic-errors -Wshadow'
    4343fi
    44 cmd="g++ test_one.cpp $*
     44cmd="g++ test_one.cpp $*"
     45if [ -e @colpack_prefix@/include ]
     46then
     47        cmd="$cmd ../cppad/local/cppad_colpack.cpp"
     48fi
     49cmd="$cmd
    4550        -o test_one.exe
    4651        $cxxflags
     
    5055        -DCPPAD_MAX_NUM_THREADS=1
    5156        @OPENMP_FLAGS@
    52         -I.. 
     57        -I..
    5358"
    5459if [ -e @adolc_prefix@/include ]
     
    7984        then
    8085                export PKG_CONFIG_PATH="@ipopt_prefix@/$lib/pkgconfig"
    81                 cflags=`pkg-config --cflags ipopt | 
     86                cflags=`pkg-config --cflags ipopt |
    8287                        sed -e 's|/coin$|/|' -e 's|/coin | |'`
    8388                libs=`pkg-config --libs ipopt`
Note: See TracChangeset for help on using the changeset viewer.