Changeset 3116 for trunk/test_more


Ignore:
Timestamp:
Feb 24, 2014 4:44:26 PM (6 years ago)
Author:
bradbell
Message:

Add option to use ColPack?, as well as CppAD, sparse coloring algorithm.

Location:
trunk/test_more
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test_more/CMakeLists.txt

    r2862 r3116  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
     
    3333        SET(test_more_adolc "")
    3434ENDIF ( adolc_prefix )
     35
     36# colpack_prefix
     37IF ( colpack_prefix )
     38        # Extra source files if we are including colpack
     39        SET(colpack_sources ../cppad/local/cppad_colpack.cpp)
     40        # add colpack to list of libraries
     41        SET(colpack_libs "ColPack")
     42ELSE ( colpack_prefix )
     43        SET(colpack_sources "")
     44        SET(colpack_libs "")
     45ENDIF ( colpack_prefix )
    3546
    3647# sources that use ipopt
     
    7586ADD_EXECUTABLE(test_more EXCLUDE_FROM_ALL test_more.cpp
    7687        ${adolc_sources}
     88        ${colpack_sources}
    7789        ${ipopt_sources}
    7890        ${eigen_sources}
     
    160172# List of libraries to be linked into the specified target
    161173TARGET_LINK_LIBRARIES(test_more
     174        ${colpack_libs}
    162175        ${test_more_adolc}
    163176        ${test_more_ipopt}
  • trunk/test_more/test_one.sh.in

    r3071 r3116  
    22# $Id$
    33# -----------------------------------------------------------------------------
    4 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     4# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
    55#
    66# CppAD is distributed under multiple licenses. This distribution is under
     
    5656        cmd="$cmd -I@adolc_prefix@/include"
    5757fi
     58if [ -e @colpack_prefix@/include ]
     59then
     60        cmd="$cmd -I@colpack_prefix@/include"
     61fi
    5862if [ -e @eigen_prefix@/include ]
    5963then
     
    6670                cmd="$cmd -L@adolc_prefix@/$lib -ladolc -lColPack"
    6771                export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@adolc_prefix@/$lib"
     72        fi
     73        if [ -e @colpack_prefix@/$lib ]
     74        then
     75                cmd="$cmd -L@colpack_prefix@/$lib -lColPack"
     76                export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@colpack_prefix@/$lib"
    6877        fi
    6978        if [ -e @ipopt_prefix@/$lib/pkgconfig ]
Note: See TracChangeset for help on using the changeset viewer.