Changeset 3754


Ignore:
Timestamp:
Nov 26, 2015 5:23:05 PM (5 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
Files:
4 added
1 deleted
22 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3732 r3754  
    134134optional_package(sacado_prefix "sacado install prefix")
    135135# -----------------------------------------------------------------------------
    136 # cppad_has_colpack
     136# cppad_has_colpack, colpack_libs
    137137#
    138138IF( colpack_prefix )
    139139        SET(cppad_has_colpack 1)
     140        SET( colpack_libs "ColPack" )
    140141ELSE( colpack_prefix )
    141142        SET(cppad_has_colpack 0)
     143        SET( colpack_libs "" )
    142144ENDIF( colpack_prefix )
    143145# =============================================================================
     
    277279ADD_SUBDIRECTORY(cppad)
    278280ADD_SUBDIRECTORY(pkgconfig)
     281ADD_SUBDIRECTORY(cppad_lib)
    279282#
    280283ADD_SUBDIRECTORY(compare_c)
     
    333336        FILES_MATCHING PATTERN "*.hpp"
    334337)
    335 IF( colpack_prefix )
    336         INSTALL(
    337                 FILES "cppad/local/cppad_colpack.cpp"
    338                 DESTINATION ${cppad_abs_datadir}/cppad
    339         )
    340 ENDIF( colpack_prefix )
    341338#
    342339# During install copy doc direcrory to cppad_abs_docdir/cppad
  • trunk/bin/gpl_license.sh

    r3650 r3754  
    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
     
    111111        then
    112112                echo "gpl-3.0.txt is in $archive_dir/$archive_name.epl.tgz"
     113                exit 1
    113114        fi
    114115        if [ "$name" == 'gpl_license.sh' ]
    115116        then
    116117                echo "gpl_license.sh is in $archive_dir/$archive_name.epl.tgz"
     118                exit 1
    117119        fi
    118120        if grep "GNU General Public License" $archive_name/$file > /dev/null
    119121        then
    120                 if [ "$name" != "doc.omh" ] && [ "$name" != 'download.omh' ]
     122                if [ "$name" != "doc.omh" ]      && \
     123                   [ "$name" != 'download.omh' ] && \
     124                   [ "$name" != 'proj_desc.py' ]
    121125                then
    122126                        echo "gpl_license.sh: name=$name"
  • trunk/configure.ac

    r3745 r3754  
    487487fi
    488488
    489 dnl test_one.sh.in uses cppad_cxx_flags and cppad_has_colpack
     489dnl test_one.sh.in settings for cppad_cxx_flags
    490490AC_SUBST(cppad_cxx_flags, "-g -O0")
    491491
    492 dnl auto-tools version does not use ../cppad/local/cppad_colpack.cpp
     492dnl auto-tools version does not colpack
    493493AC_SUBST(cppad_has_colpack, 0)
    494494
  • trunk/cppad_ipopt/CMakeLists.txt

    r3120 r3754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    1010# Please visit http://www.coin-or.org/CppAD/ for information on other licenses.
    1111# -----------------------------------------------------------------------------
    12 # Build the cppad_ipopt/* directory tests 
     12# Build the cppad_ipopt/* directory tests
    1313# Inherit environment from ../CMakeList.txt
    14 
    15 # colpack_prefix
    16 SET(sources ../../cppad/local/cppad_colpack.cpp)
    17 sources_libs_define(colpack "${sources}" ColPack "")
    1814
    1915# Initialize list of tests as empty
     
    2218# assert ipopt_prefix is defined
    2319IF ( NOT ipopt_prefix )
    24         MESSAGE(FATAL_ERROR 
     20        MESSAGE(FATAL_ERROR
    2521                "cppad_ipopt/CMakeLists.txt: ipopt_prefix = ${ipopt_prefix}"
    2622        )
    2723ENDIF ( NOT ipopt_prefix )
    2824
    29 # The CMakeLists.txt file in the specified source directory is processed 
     25# The CMakeLists.txt file in the specified source directory is processed
    3026# before the current input file continues beyond this command.
    3127# add_subdirectory(source_dir [binary_dir] [EXCLUDE_FROM_ALL])
  • trunk/cppad_ipopt/example/CMakeLists.txt

    r3116 r3754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    1010# Please visit http://www.coin-or.org/CppAD/ for information on other licenses.
    1111# -----------------------------------------------------------------------------
    12 # Build the cppad_ipopt/example directory tests 
     12# Build the cppad_ipopt/example directory tests
    1313# Inherit environment from ../CMakeList.txt
    1414
    15 # Specifies build type for this directory. Possible values are 
     15# Specifies build type for this directory. Possible values are
    1616# empty, Debug, Release, RelWithDebInfo and MinSizeRel
    1717SET(CMAKE_BUILD_TYPE DEBUG)
     
    2626#                 source1 source2 ... sourceN
    2727# )
    28 ADD_EXECUTABLE(cppad_ipopt_example EXCLUDE_FROM_ALL 
     28ADD_EXECUTABLE(cppad_ipopt_example EXCLUDE_FROM_ALL
    2929        example.cpp
    3030        get_started.cpp
     
    4343
    4444# List of libraries to be linked into the specified target
    45 TARGET_LINK_LIBRARIES(cppad_ipopt_example
    46         cppad_ipopt
     45TARGET_LINK_LIBRARIES(cppad_ipopt_example
     46        cppad_ipopt
     47        cppad_lib
    4748        ${ipopt_LIBRARIES}
    4849        ${colpack_libs}
  • trunk/cppad_ipopt/speed/CMakeLists.txt

    r3116 r3754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    1010# Please visit http://www.coin-or.org/CppAD/ for information on other licenses.
    1111# -----------------------------------------------------------------------------
    12 # Build the cppad_ipopt/speed directory tests 
     12# Build the cppad_ipopt/speed directory tests
    1313# Inherit environment from ../CMakeList.txt
    1414
    15 # Specifies build type for this directory. Possible values are 
     15# Specifies build type for this directory. Possible values are
    1616# empty, Debug, Release, RelWithDebInfo and MinSizeRel
    1717SET(CMAKE_BUILD_TYPE RELEASE)
     
    2727#                 source1 source2 ... sourceN
    2828# )
    29 # Include source for cppad_ipopt library so we build it without debugging 
    30 ADD_EXECUTABLE(cppad_ipopt_speed EXCLUDE_FROM_ALL 
     29# Include source for cppad_ipopt library so we build it without debugging
     30ADD_EXECUTABLE(cppad_ipopt_speed EXCLUDE_FROM_ALL
    3131        speed.cpp
    3232        ../src/cppad_ipopt_nlp.cpp
     
    3636        ../src/sparse_map2vec.cpp
    3737        ../src/vec_fun_pattern.cpp
    38         ode_speed.cpp 
     38        ode_speed.cpp
    3939)
    4040
     
    4444# List of libraries to be linked into the specified target
    4545TARGET_LINK_LIBRARIES(
    46         cppad_ipopt_speed
    47         cppad_ipopt
     46        cppad_ipopt_speed
     47        cppad_ipopt
     48        cppad_lib
    4849        ${ipopt_LIBRARIES}
    4950        ${colpack_libs}
  • trunk/cppad_ipopt/src/CMakeLists.txt

    r3116 r3754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    1313# Inherit environment from ../CMakeList.txt
    1414
    15 # Specifies build type for this directory. Possible values are 
     15# Specifies build type for this directory. Possible values are
    1616# empty, Debug, Release, RelWithDebInfo and MinSizeRel
    1717SET(CMAKE_BUILD_TYPE DEBUG)
     
    2020#       source1 source2 ... sourceN)
    2121# )
    22 ADD_LIBRARY(cppad_ipopt 
     22ADD_LIBRARY(cppad_ipopt
    2323        cppad_ipopt_nlp.cpp
    2424        hes_fg_map.cpp
    2525        jac_g_map.cpp
    2626        sparse_map2vec.cpp
    27         vec_fun_pattern.cpp
    28         ${colpack_sources}
     27        vec_fun_pattern.cpp
    2928)
    3029
  • trunk/cppad_ipopt/test/CMakeLists.txt

    r3116 r3754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    1010# Please visit http://www.coin-or.org/CppAD/ for information on other licenses.
    1111# -----------------------------------------------------------------------------
    12 # Build the cppad_ipopt/test directory tests 
     12# Build the cppad_ipopt/test directory tests
    1313# Inherit environment from ../CMakeList.txt
    1414
    15 # Specifies build type for this directory. Possible values are 
     15# Specifies build type for this directory. Possible values are
    1616# empty, Debug, Release, RelWithDebInfo and MinSizeRel
    1717SET(CMAKE_BUILD_TYPE DEBUG)
     
    3535
    3636# List of libraries to be linked into the specified target
    37 TARGET_LINK_LIBRARIES(cppad_ipopt_test
    38         cppad_ipopt
    39         ${ipopt_LIBRARIES}
    40         ${colpack_libs}
     37TARGET_LINK_LIBRARIES(cppad_ipopt_test
     38        cppad_ipopt
     39        cppad_lib
     40        ${ipopt_LIBRARIES}
     41        ${colpack_libs}
    4142)
    4243
  • trunk/example/CMakeLists.txt

    r3746 r3754  
    2929
    3030# colpack_prefix
    31 SET(sources
     31SET(colpack_sources
    3232        colpack_hes.cpp
    3333        colpack_jac.cpp
    34         ../cppad/local/cppad_colpack.cpp
    35 )
    36 sources_libs_define(colpack "${sources}" ColPack COLPACK_EXAMPLES)
     34)
    3735
    3836# eigen_prefix
     
    217215# List of libraries to be linked into the specified target
    218216TARGET_LINK_LIBRARIES(example
     217        cppad_lib
    219218        ${adolc_libs}
    220219        ${colpack_libs}
  • trunk/example/ipopt_solve/CMakeLists.txt

    r3746 r3754  
    1919LINK_DIRECTORIES( ${ipopt_LIBRARY_DIRS} )
    2020
    21 # colpack_prefix
    22 IF ( colpack_prefix )
    23         # Extra source files if we are including colpack
    24         SET(colpack_sources ../../cppad/local/cppad_colpack.cpp)
    25         # add colpack to list of libraries
    26         SET(colpack_libs "ColPack")
    27 ELSE ( colpack_prefix )
    28         SET(colpack_sources "")
    29         SET(colpack_libs "")
    30 ENDIF ( colpack_prefix )
    31 
    3221# Copy a file to another location and modify its contents.
    3322# configure_file(InputFile OutputFile [COPYONLY] [ESCAPE_QUOTES] [@ONLY])
     
    4332        ode_inverse.cpp
    4433        retape.cpp
    45         ${colpack_sources}
    4634)
    4735
     
    5139# libraries to be linked into the specified target,
    5240# as determined by pkg-config for ipopt
    53 TARGET_LINK_LIBRARIES(example_ipopt_solve ${ipopt_LIBRARIES} ${colpack_libs})
     41TARGET_LINK_LIBRARIES(example_ipopt_solve
     42        cppad_lib
     43        ${ipopt_LIBRARIES}
     44        ${colpack_libs}
     45)
    5446
    5547# Add the check_example_ipopt_solve target
  • trunk/example/test_one.sh.in

    r3683 r3754  
    4646fi
    4747cmd="g++ test_one.cpp $*"
    48 if [ -e @colpack_prefix@/include ]
    49 then
    50         cmd="$cmd ../cppad/local/cppad_colpack.cpp"
    51 fi
    5248cmd="$cmd
    5349        -o test_one.exe
    5450        $cxxflags
     51        -L @cppad_BINARY_DIR@/cppad_lib
     52        -lcppad_lib
    5553        -g
    5654        -fopenmp
     
    8684        fi
    8785done
     86export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@cppad_BINARY_DIR@/cppad_lib"
    8887echo $cmd
    8988$cmd
  • trunk/omh/install/colpack_prefix.omh

    r3664 r3754  
    4949is a valid way to reference to the include file $code ColPackHeaders.h$$.
    5050
    51 $head cppad_colpack.cpp$$
    52 $index cppad_colpack.cpp$$
     51$head cppad_lib$$
    5352The ColPack header files has a
    5453$codei%
     
    5756at the global level.
    5857For this reason, CppAD does not include these files.
    59 It is therefore necessary to compile and link the short file
    60 $codei%
    61         %prefix%/%dir%/cppad/cppad_colpack.cpp
    62 %$$
    63 where $icode dir$$ is the
    64 $cref/cmake_install_datadir/cmake/cmake_install_datadir/$$ and
    65 where $icode prefix$$ is such that $code cppad.hpp$$ was installed in
    66 $codei%
    67         %prefix%/include/cppad/cppad.hpp
    68 %$$
    69 Hopefully, future versions of ColPack will not have this problem
    70 and it will no longer be necessary to do this.
     58It is therefore necessary to link the object library $code cppad_lib$$
     59when using ColPack.
    7160
    7261$children%example/colpack_jac.cpp
  • trunk/omh/whats_new/whats_new_14.omh

    r3696 r3754  
    211211$head 05-27$$
    212212$list number$$
    213 The $cref/cppad_colpack.cpp/colpack_prefix/cppad_colpack.cpp/$$
     213The $code cppad_colpack.cpp$$
    214214file was not being copied to the specified directory.
    215215In addition, the specified directory was changed from an include
    216 directory to data directory
    217 ($code cppad_colpack.cpp$$ is not an include file).
     216directory to data directory because
     217$code cppad_colpack.cpp$$ is not an include file.
    218218$lnext
    219219If $cref colpack_prefix$$  was specified, the CppAD
  • trunk/omh/whats_new/whats_new_15.omh

    r3753 r3754  
    1414$dollar @$$
    1515$spell
     16        lcppad
    1617        ind
    1718        const
     
    7677assist you in learning about changes between various versions of CppAD.
    7778
     79$head 11-25$$
     80$list number$$
     81CppAD now installs the object library
     82$codep
     83        -lcppad_lib
     84$$
     85to be included when linking.
     86Currently, it is only required when
     87$cref colpack_prefix$$ is specified on the
     88$cref/cmake command/cmake/CMake Command/$$.
     89$lnext
     90It is no longer necessary to compile and link the file
     91$codep
     92        cppad_colpack.cpp
     93$$
     94when $cref colpack_prefix$$
     95is specified during the install process; see
     96$cref/cmake command/cmake/CMake Command/$$.
     97(It is included in $code cppad_lib$$).
     98$lend
     99
    78100$head 11-24$$
    79101$list number$$
  • trunk/pkgconfig/cppad-uninstalled.pc.in

    r2601 r3754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    1717URL:          @cppad_url@
    1818Cflags:       -I@cppad_SOURCE_DIR@
    19 Libs:
     19Libs:         -L@cppad_BINARY_DIR@/lib -lcppad_lib
    2020Requires:
  • trunk/speed/CMakeLists.txt

    r3725 r3754  
    1919# Possible values are DEBUG, RELEASE, RelWithDebInfo and MinSizeRel
    2020SET(CMAKE_BUILD_TYPE RELEASE)
    21 
    22 # colpack_prefix
    23 SET(sources ../../cppad/local/cppad_colpack.cpp)
    24 sources_libs_define(colpack "${sources}" ColPack COLPACK_SPEED)
    2521
    2622# Initialize list of tests as empty
  • trunk/speed/adolc/CMakeLists.txt

    r3141 r3754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    1010# Please visit http://www.coin-or.org/CppAD/ for information on other licenses.
    1111# -----------------------------------------------------------------------------
    12 # Build the speed/adolc directory tests 
     12# Build the speed/adolc directory tests
    1313# Inherit environment from ../CMakeList.txt
    1414# CMAKE_BUILD_TYPE determined by parent directory
     
    1616# assert adolc_prefix is defined
    1717IF ( NOT adolc_prefix )
    18         MESSAGE(FATAL_ERROR 
     18        MESSAGE(FATAL_ERROR
    1919                "speed/adolc/CMakeLists.txt: adolc_prefix = ${adolc_prefix}"
    2020        )
     
    2222
    2323
    24 # Adds flags to the compiler command line for sources in the current directory 
    25 # and below. This command can be used to add any flags, but it was originally 
    26 # intended to add preprocessor definitions. 
     24# Adds flags to the compiler command line for sources in the current directory
     25# and below. This command can be used to add any flags, but it was originally
     26# intended to add preprocessor definitions.
    2727ADD_DEFINITIONS("-DCPPAD_ADOLC_SPEED")
    2828
     
    4747
    4848# List of libraries to be linked into the specified target
    49 TARGET_LINK_LIBRARIES(speed_adolc speed_src adolc ${colpack_libs} )
     49TARGET_LINK_LIBRARIES(speed_adolc
     50        speed_src
     51        cppad_lib
     52        adolc
     53        ${colpack_libs}
     54)
    5055
    5156# Add the check_speed_adolc target
    5257ADD_CUSTOM_TARGET(
    53         check_speed_adolc 
     58        check_speed_adolc
    5459        speed_adolc correct 54321 colpack
    55         DEPENDS 
     60        DEPENDS
    5661        speed_adolc speed_src
    5762)
  • trunk/speed/cppad/CMakeLists.txt

    r3139 r3754  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    1010# Please visit http://www.coin-or.org/CppAD/ for information on other licenses.
    1111# -----------------------------------------------------------------------------
    12 # Build the speed/cppad directory tests 
     12# Build the speed/cppad directory tests
    1313# Inherit environment from ../CMakeList.txt
    1414# CMAKE_BUILD_TYPE determined by parent directory
    1515
    16 # Adds flags to the compiler command line for sources in the current directory 
    17 # and below. This command can be used to add any flags, but it was originally 
    18 # intended to add preprocessor definitions. 
     16# Adds flags to the compiler command line for sources in the current directory
     17# and below. This command can be used to add any flags, but it was originally
     18# intended to add preprocessor definitions.
    1919ADD_DEFINITIONS("-DCPPAD_CPPAD_SPEED")
    2020
     
    2525#                 source1 source2 ... sourceN
    2626# )
    27 ADD_EXECUTABLE(speed_cppad EXCLUDE_FROM_ALL ../main.cpp 
     27ADD_EXECUTABLE(speed_cppad EXCLUDE_FROM_ALL ../main.cpp
    2828        det_lu.cpp
    2929        det_minor.cpp
     
    3939
    4040# List of libraries to be linked into the specified target
    41 TARGET_LINK_LIBRARIES(speed_cppad speed_src ${colpack_libs})
     41TARGET_LINK_LIBRARIES(speed_cppad
     42        speed_src
     43        cppad_lib
     44        ${colpack_libs}
     45)
    4246
    4347# Add the check_speed_cppad target
    44 ADD_CUSTOM_TARGET(check_speed_cppad 
     48ADD_CUSTOM_TARGET(check_speed_cppad
    4549        speed_cppad correct 54321
    4650        DEPENDS speed_cppad speed_src
  • trunk/speed/profile/CMakeLists.txt

    r3725 r3754  
    4444        ../src/link_sparse_jacobian.cpp
    4545        ../src/microsoft_timer.cpp
    46         ${colpack_sources}
    4746)
    4847
     
    5251# profile builds it own copy of src/speed library (see ADD_EXECUTABLE above)
    5352# TARGET_LINK_LIBRARIES(speed_profile speed_src )
    54 TARGET_LINK_LIBRARIES(speed_profile ${colpack_libs} )
     53TARGET_LINK_LIBRARIES(speed_profile
     54        cppad_lib
     55        ${colpack_libs}
     56)
    5557
    5658# Add the check_speed_profile target
  • trunk/speed/src/CMakeLists.txt

    r3637 r3754  
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    2828        link_sparse_jacobian.cpp
    2929        microsoft_timer.cpp
    30         ${colpack_sources}
    3130)
    3231
  • 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.