Changeset 3754 for trunk/test_more


Ignore:
Timestamp:
Nov 26, 2015 5:23:05 PM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 4d397fa0c1ba147098a173bdbbca67432066d6e8
end hash code: 7dfec41e8207862aebc5f7ca502453f0aeda4640

commit 7dfec41e8207862aebc5f7ca502453f0aeda4640
Author: Brad Bell <bradbell@…>
Date: Thu Nov 26 12:48:39 2015 -0800

Remove invisible white space.

commit 8537354fe503177568e5e9ee92ade691749e5201
Author: Brad Bell <bradbell@…>
Date: Thu Nov 26 12:48:31 2015 -0800

Create cppad object library with cppad_colpack.cpp as its initial object.

Location:
trunk/test_more
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test_more/CMakeLists.txt

    r3740 r3754  
    2424SET(sources base_adolc.cpp)
    2525sources_libs_define(adolc "${sources}" adolc ADOLC_TEST)
    26 
    27 # colpack_prefix
    28 SET(sources ../cppad/local/cppad_colpack.cpp)
    29 sources_libs_define(colpack "${sources}" ColPack COLPACK_TEST)
    3026
    3127# ipopt_prefix
     
    6864        old_mat_mul.cpp
    6965        ${adolc_sources}
    70         ${colpack_sources}
    7166        ${ipopt_sources}
    7267        abs.cpp
     
    166161# List of libraries to be linked into the specified target
    167162TARGET_LINK_LIBRARIES(test_more
    168         ${colpack_libs}
     163        cppad_lib
    169164        ${adolc_libs}
    170165        ${ipopt_libs}
    171166        ${eigen_libs}
     167        ${colpack_libs}
    172168)
    173169
  • trunk/test_more/test_one.sh.in

    r3733 r3754  
    4242fi
    4343cmd="g++ test_one.cpp $*"
    44 if [ -e @colpack_prefix@/include ]
    45 then
    46         cmd="$cmd ../cppad/local/cppad_colpack.cpp"
    47 fi
    4844cmd="$cmd
    4945        -o test_one.exe
    5046        $cxxflags
     47        -L @cppad_BINARY_DIR@/cppad_lib
     48        -lcppad_lib
    5149        -g
    5250        -fopenmp
     
    8886        fi
    8987done
     88export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@cppad_BINARY_DIR@/cppad_lib"
    9089echo $cmd
    9190$cmd
Note: See TracChangeset for help on using the changeset viewer.