Changeset 3803


Ignore:
Timestamp:
Mar 19, 2016 1:07:48 AM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: d75b0cba62a41b958b974a326168299773bc4614
end hash code: 8dd8b10d36b325a3f4bbf3c03f1ea00e288331ae

commit 8dd8b10d36b325a3f4bbf3c03f1ea00e288331ae
Author: Brad Bell <bradbell@…>
Date: Fri Mar 18 20:25:17 2016 -0700

  1. replace multiple */test_one.sh.in by one bin/test_one.sh.
  2. remove test_one.sh.in from auto-tools build.

commit e524af11d04938103d42963e393b3637616dc278
Author: Brad Bell <bradbell@…>
Date: Fri Mar 18 10:02:38 2016 -0700

Move solve.cpp -> ipopt_solve.cpp so has same name as its directory.

commit 4714099e4eef9226536760e206f988440eec2f48
Author: Brad Bell <bradbell@…>
Date: Fri Mar 18 09:50:37 2016 -0700

Use system include option to supress all warnings in eigen and fadbad source.

Location:
trunk
Files:
2 added
6 deleted
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r3781 r3803  
    99doxydoc
    1010cppad/configure.hpp
     11test_one.cpp
     12test_one.exe
     13bin/test_one.sh
    1114# all directories
    1215*.err
     
    2528*/build
    2629*/*/build
    27 test_one.exe
    28 */test_one.exe
    29 */*/test_one.exe
    30 test_one.sh
    31 */test_one.sh
    32 */*/test_one.sh
    33 test_one.cpp
    34 */test_one.cpp
    35 */*/test_one.cpp
    3630# all directories with and without extension
    3731new
  • trunk/AUTHORS

    r3802 r3803  
    22             ===========================================
    33
    4 To date, 2016-03-17, Bradley M. Bell is the sole author of CppAD.
     4To date, 2016-03-18, Bradley M. Bell is the sole author of CppAD.
    55While Bradley M. Bell worked for the University of Washington during
    66the development of CppAD, the following are also true:
  • trunk/CMakeLists.txt

    r3802 r3803  
    1818
    1919# cppad_version is used by set_version.sh to get the version number.
    20 SET(cppad_version      "20160317" )
     20SET(cppad_version      "20160318" )
    2121SET(cppad_url          "http://www.coin-or.org/CppAD" )
    2222SET(cppad_description  "Differentiation of C++ Algorithms" )
     
    124124)
    125125# -----------------------------------------------------------------------------
    126 # External package prefixes
     126# External package prefixes with warnings
     127SET(system_include FALSE)
    127128#
    128129# adolc_prefix
    129 optional_package(adolc_prefix "adolc install prefix")
     130optional_package(adolc_prefix ${system_include} "adolc install prefix")
    130131#
    131132# colpack_prefix
    132 optional_package(colpack_prefix "colpack install prefix")
     133optional_package(colpack_prefix ${system_include} "colpack install prefix")
     134#
     135# ipopt_prefix
     136optional_package(ipopt_prefix ${system_include} "ipopt install prefix")
     137#
     138# sacado_prefix
     139optional_package(sacado_prefix ${system_include} "sacado install prefix")
     140# -----------------------------------------------------------------------------
     141# External package prefixes without  warnings
     142SET(system_include TRUE)
    133143#
    134144# eigen_prefix
    135 optional_package(eigen_prefix "eigen install prefix")
     145optional_package(eigen_prefix ${system_include} "eigen install prefix")
    136146#
    137147# fadbad_prefix
    138 optional_package(fadbad_prefix "fadbad install prefix")
    139 #
    140 # ipopt_prefix
    141 optional_package(ipopt_prefix "ipopt install prefix")
    142 #
    143 # sacado_prefix
    144 optional_package(sacado_prefix "sacado install prefix")
     148optional_package(fadbad_prefix ${system_include} "fadbad install prefix")
    145149# -----------------------------------------------------------------------------
    146150# cppad_has_colpack, colpack_libs, cppad_lib
     
    167171        MESSAGE(STATUS "cppad_cxx_flags_sacado = ${cppad_cxx_flags_sacado}")
    168172ENDIF( sacado_prefix )
    169 # -----------------------------------------------------------------------------
    170 # cppad_cxx_flags_eigen
    171 STRING(REGEX REPLACE
    172         "(.*)-Wshadow(.*)"         "\\1-Wno-shadow -Wno-deprecated-declarations\\2"
    173         cppad_cxx_flags_eigen "${cppad_cxx_flags}"
    174 )
    175 IF( eigen_prefix )
    176         MESSAGE(STATUS "cppad_cxx_flags_eigen = ${cppad_cxx_flags_eigen}")
    177 ENDIF( eigen_prefix )
    178 # -----------------------------------------------------------------------------
    179 # cppad_cxx_flags_fadbad
    180 STRING(REGEX REPLACE
    181         "(.*)-Wshadow(.*)"         "\\1-Wno-shadow\\2"
    182         cppad_cxx_flags_fadbad "${cppad_cxx_flags}"
    183 )
    184 IF( fadbad_prefix )
    185         MESSAGE(STATUS "cppad_cxx_flags_fadbad = ${cppad_cxx_flags_fadbad}")
    186 ENDIF( fadbad_prefix )
    187173# -----------------------------------------------------------------------------
    188174# CMAKE_CXX_FLAGS
     
    322308#
    323309ADD_CUSTOM_TARGET(check DEPENDS ${check_depends})
    324 #
     310# ============================================================================
     311# Copy a file to another location and modify its contents.
     312# configure_file(InputFile OutputFile [COPYONLY] [ESCAPE_QUOTES] [@ONLY])
     313CONFIGURE_FILE(
     314        ${CMAKE_CURRENT_SOURCE_DIR}/bin/test_one.sh.in
     315        ${CMAKE_CURRENT_SOURCE_DIR}/bin/test_one.sh
     316)
    325317# =============================================================================
    326318# install procedure
  • trunk/cmake/add_cppad_cxx_flags.cmake

    r3320 r3803  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 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 # -----------------------------------------------------------------------------
    1312# add_cppad_cxx_flags(target_name)
    1413#
    1514# target_name: (in)
    16 # For package equal to "eigen", "fadbad", "scaado", if target_name ends in
    17 # _package, the compiler flags for this target are set to
    18 #       cppad_cxx_flags_package
     15# If target_name ends in _sacado,
     16# the compiler flags for this target are set to
     17#       cppad_cxx_flags_sacado
    1918# Otherwise, the compiler flags for this target are set to
    2019#       cppad_cxx_flags.
    2120#
    2221# Side Effects:
    23 # The variables package and flags are used for scratch space and not
     22# The variable flags is used for scratch space and not
    2423# defined after the completion of this macro.
    2524#
    26 MACRO(add_cppad_cxx_flags target_name) 
     25MACRO(add_cppad_cxx_flags target_name)
    2726        #
    2827        SET(flags ${cppad_cxx_flags})
    29         FOREACH(package eigen fadbad sacado)
    30                 IF( ${target_name} MATCHES ".*_${package}$" )
    31                         SET(flags "${cppad_cxx_flags_${package}}")
    32                         MESSAGE(STATUS
    33                                 "${target_name} cxx_flags = ${cppad_cxx_flags_${package}}"
    34                         )
    35                 ENDIF( ${target_name} MATCHES ".*_${package}$" )
    36                 IF( ${target_name} MATCHES ".*_${package}_lib$" )
    37                         SET(flags "${cppad_cxx_flags_${package}}")
    38                         MESSAGE(STATUS
    39                                 "${target_name} cxx_flags = ${cppad_cxx_flags_${package}}"
    40                         )
    41                 ENDIF( ${target_name} MATCHES ".*_${package}_lib$" )
    42         ENDFOREACH(package)
     28        IF( ${target_name} MATCHES ".*_sacado$" )
     29                SET(flags "${cppad_cxx_flags_sacado}")
     30                MESSAGE(STATUS
     31                        "${target_name} cxx_flags = ${cppad_cxx_flags_sacado}"
     32                )
     33        ENDIF( ${target_name} MATCHES ".*_sacado$" )
    4334        IF( flags )
    44                 SET_TARGET_PROPERTIES( 
     35                SET_TARGET_PROPERTIES(
    4536                        ${target_name} PROPERTIES COMPILE_FLAGS "${flags}"
    4637                )
    4738        ELSE( flags )
    48                 SET_TARGET_PROPERTIES( 
     39                SET_TARGET_PROPERTIES(
    4940                        ${target_name} PROPERTIES COMPILE_FLAGS ""
    5041                )
    5142        ENDIF( flags )
    52 ENDMACRO(add_cppad_cxx_flags) 
     43ENDMACRO(add_cppad_cxx_flags)
  • trunk/cmake/optional_package.cmake

    r2771 r3803  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 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 # optional_package(prefix_variable description)
     12# optional_package(prefix_variable system_include description)
    1313#
    1414# prefix_variable: (out)
    15 # is a PATH variable that holds the prefix for this optional package.
    16 # If this variable is not set by the cmake command line (or gui),
    17 # it is set to the default value NOTFOUND.
    18 # If this variable is set by the cmake command line, the following is done:
    19 # 1. All the valid include subdirectories are added using INCLUDE_DIRECTORIES.
    20 # 2. All the valid library subdirectories are added using LINK_DIRECTORIES.
    21 # where the valid include and library directories are determined by
    22 # cmake_install_includedirs and cmakd_install_libdirs respectively.
     15# is a PATH variable that holds the install prefix for this optional package.
     16#
     17# system_include: (in)
     18# If this is true, the include files for this package should be treated as
     19# system files (no warnings).
    2320#
    2421# description: (in)
    2522# is a description for the install prefix for this optional package.
    2623#
    27 MACRO(optional_package prefix_variable description)
     24# If package_variable is not set by the cmake command line (or gui),
     25# it is set to the default value NOTFOUND.
     26#
     27# If package_variable is set by the cmake command line, the following is done:
     28# 1. All the valid include subdirectories are added using INCLUDE_DIRECTORIES.
     29# 2. All the valid library subdirectories are added using LINK_DIRECTORIES.
     30# The set of valid include and library directories are determined by
     31# cmake_install_includedirs and cmakd_install_libdirs respectively.
     32#
     33# description: (in)
     34#
     35MACRO(optional_package prefix_variable system_include description)
    2836        SET(${prefix_variable} NOTFOUND CACHE PATH "${description}")
    2937        SET(prefix ${${prefix_variable}} )
     
    3341                FOREACH(dir ${cmake_install_includedirs})
    3442                        IF(IS_DIRECTORY ${prefix}/${dir} )
    35                                 INCLUDE_DIRECTORIES( ${prefix}/${dir} )
    36                                 MESSAGE(STATUS "Found ${prefix}/${dir}")
     43                                IF( ${system_include} )
     44                                        INCLUDE_DIRECTORIES( SYSTEM ${prefix}/${dir} )
     45                                        MESSAGE(STATUS "    Found SYSTEM ${prefix}/${dir}")
     46                                ELSE( ${system_include} )
     47                                        INCLUDE_DIRECTORIES( ${prefix}/${dir} )
     48                                        MESSAGE(STATUS "    Found ${prefix}/${dir}")
     49                                ENDIF( ${system_include} )
    3750                        ENDIF(IS_DIRECTORY ${prefix}/${dir} )
    3851                ENDFOREACH(dir)
     
    4255                        IF(IS_DIRECTORY ${prefix}/${dir} )
    4356                                LINK_DIRECTORIES( ${prefix}/${dir} )
    44                                 MESSAGE(STATUS "Found ${prefix}/${dir}")
     57                                MESSAGE(STATUS "    Found ${prefix}/${dir}")
    4558                        ENDIF(IS_DIRECTORY ${prefix}/${dir} )
    4659                ENDFOREACH(dir)
  • trunk/configure

    r3802 r3803  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for cppad 20160317.
     3# Generated by GNU Autoconf 2.69 for cppad 20160318.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    581581PACKAGE_NAME='cppad'
    582582PACKAGE_TARNAME='cppad'
    583 PACKAGE_VERSION='20160317'
    584 PACKAGE_STRING='cppad 20160317'
     583PACKAGE_VERSION='20160318'
     584PACKAGE_STRING='cppad 20160318'
    585585PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    586586PACKAGE_URL=''
     
    14071407  # This message is too long to be a string in the A/UX 3.1 sh.
    14081408  cat <<_ACEOF
    1409 \`configure' configures cppad 20160317 to adapt to many kinds of systems.
     1409\`configure' configures cppad 20160318 to adapt to many kinds of systems.
    14101410
    14111411Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14771477if test -n "$ac_init_help"; then
    14781478  case $ac_init_help in
    1479      short | recursive ) echo "Configuration of cppad 20160317:";;
     1479     short | recursive ) echo "Configuration of cppad 20160318:";;
    14801480   esac
    14811481  cat <<\_ACEOF
     
    16111611if $ac_init_version; then
    16121612  cat <<\_ACEOF
    1613 cppad configure 20160317
     1613cppad configure 20160318
    16141614generated by GNU Autoconf 2.69
    16151615
     
    22402240running configure, to aid debugging if configure makes a mistake.
    22412241
    2242 It was created by cppad $as_me 20160317, which was
     2242It was created by cppad $as_me 20160318, which was
    22432243generated by GNU Autoconf 2.69.  Invocation command line was
    22442244
     
    31303130# Define the identity of the package.
    31313131 PACKAGE='cppad'
    3132  VERSION='20160317'
     3132 VERSION='20160318'
    31333133
    31343134
     
    79147914ipopt_prefix=${IPOPT_DIR}
    79157915
    7916 ac_config_files="$ac_config_files cppad/configure.hpp cppad_ipopt/example/test.sh cppad_ipopt/speed/test.sh cppad_ipopt/test/test.sh example/ipopt_solve/test.sh example/test_one.sh pkgconfig/cppad.pc pkgconfig/cppad-uninstalled.pc test_more/test_one.sh makefile compare_c/makefile cppad_ipopt/src/makefile cppad_ipopt/example/makefile cppad_ipopt/speed/makefile cppad_ipopt/test/makefile example/makefile example/atomic/makefile example/ipopt_solve/makefile introduction/get_started/makefile introduction/exp_apx/makefile multi_thread/makefile multi_thread/test_multi/makefile print_for/makefile speed/adolc/makefile speed/cppad/makefile speed/double/makefile speed/example/makefile speed/fadbad/makefile speed/profile/makefile speed/profile/gprof.sed speed/sacado/makefile speed/src/makefile test_more/makefile"
     7916ac_config_files="$ac_config_files cppad/configure.hpp cppad_ipopt/example/test.sh cppad_ipopt/speed/test.sh cppad_ipopt/test/test.sh example/ipopt_solve/test.sh pkgconfig/cppad.pc pkgconfig/cppad-uninstalled.pc makefile compare_c/makefile cppad_ipopt/src/makefile cppad_ipopt/example/makefile cppad_ipopt/speed/makefile cppad_ipopt/test/makefile example/makefile example/atomic/makefile example/ipopt_solve/makefile introduction/get_started/makefile introduction/exp_apx/makefile multi_thread/makefile multi_thread/test_multi/makefile print_for/makefile speed/adolc/makefile speed/cppad/makefile speed/double/makefile speed/example/makefile speed/fadbad/makefile speed/profile/makefile speed/profile/gprof.sed speed/sacado/makefile speed/src/makefile test_more/makefile"
    79177917
    79187918
     
    79247924
    79257925ac_config_commands="$ac_config_commands cppad_ipopt_test_test.sh"
    7926 
    7927 ac_config_commands="$ac_config_commands example_test_one.sh"
    7928 
    7929 ac_config_commands="$ac_config_commands test_more_test_one.sh"
    79307926
    79317927
     
    85688564# values after options handling.
    85698565ac_log="
    8570 This file was extended by cppad $as_me 20160317, which was
     8566This file was extended by cppad $as_me 20160318, which was
    85718567generated by GNU Autoconf 2.69.  Invocation command line was
    85728568
     
    86258621ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    86268622ac_cs_version="\\
    8627 cppad config.status 20160317
     8623cppad config.status 20160318
    86288624configured by $0, generated by GNU Autoconf 2.69,
    86298625  with options \\"\$ac_cs_config\\"
     
    87398735
    87408736
    8741 
    8742 
    8743 
    8744 
    87458737_ACEOF
    87468738
     
    87578749    "cppad_ipopt/test/test.sh") CONFIG_FILES="$CONFIG_FILES cppad_ipopt/test/test.sh" ;;
    87588750    "example/ipopt_solve/test.sh") CONFIG_FILES="$CONFIG_FILES example/ipopt_solve/test.sh" ;;
    8759     "example/test_one.sh") CONFIG_FILES="$CONFIG_FILES example/test_one.sh" ;;
    87608751    "pkgconfig/cppad.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/cppad.pc" ;;
    87618752    "pkgconfig/cppad-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/cppad-uninstalled.pc" ;;
    8762     "test_more/test_one.sh") CONFIG_FILES="$CONFIG_FILES test_more/test_one.sh" ;;
    87638753    "makefile") CONFIG_FILES="$CONFIG_FILES makefile" ;;
    87648754    "compare_c/makefile") CONFIG_FILES="$CONFIG_FILES compare_c/makefile" ;;
     
    87898779    "cppad_ipopt_speed_test.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS cppad_ipopt_speed_test.sh" ;;
    87908780    "cppad_ipopt_test_test.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS cppad_ipopt_test_test.sh" ;;
    8791     "example_test_one.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS example_test_one.sh" ;;
    8792     "test_more_test_one.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS test_more_test_one.sh" ;;
    87938781
    87948782  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
     
    93179305    "cppad_ipopt_speed_test.sh":C) chmod +x cppad_ipopt/speed/test.sh ;;
    93189306    "cppad_ipopt_test_test.sh":C) chmod +x cppad_ipopt/test/test.sh ;;
    9319     "example_test_one.sh":C) chmod +x example/test_one.sh ;;
    9320     "test_more_test_one.sh":C) chmod +x test_more/test_one.sh ;;
    93219307
    93229308  esac
  • trunk/configure.ac

    r3802 r3803  
    1313dnl Process this file with autoconf to produce a configure script.
    1414dnl   package   version              bug-report
    15 AC_INIT([cppad], [20160317], [cppad@list.coin-or.org])
     15AC_INIT([cppad], [20160318], [cppad@list.coin-or.org])
    1616AM_SILENT_RULES([yes])
    1717
     
    478478fi
    479479
    480 dnl test_one.sh.in settings for cppad_cxx_flags
     480dnl test_one.sh.in settings for cppad_cxx_flags (no longer used ?)
    481481AC_SUBST(cppad_cxx_flags, "-g -O0")
    482482
     
    761761dnl
    762762dnl names set here so */test_one.sh.in works both with cmake and autoconf
     763dnl (no longer used ?)
    763764AC_SUBST(adolc_prefix,      ${ADOLC_DIR} )
    764765AC_SUBST(eigen_prefix,      ${EIGEN_DIR} )
     
    774775        cppad_ipopt/test/test.sh
    775776        example/ipopt_solve/test.sh
    776         example/test_one.sh
    777777        pkgconfig/cppad.pc
    778778        pkgconfig/cppad-uninstalled.pc
    779         test_more/test_one.sh
    780779
    781780        makefile
     
    825824        []
    826825)
    827 AC_CONFIG_COMMANDS(
    828         [example_test_one.sh],
    829         [chmod +x example/test_one.sh],
    830         []
    831 )
    832 AC_CONFIG_COMMANDS(
    833         [test_more_test_one.sh],
    834         [chmod +x test_more/test_one.sh],
    835         []
    836 )
    837826
    838827dnl create all the requested output files
  • trunk/doc.omh

    r3802 r3803  
    9292$comment bin/version assumes that : follows cppad version number here$$
    9393$section
    94 cppad-20160317: A Package for Differentiation of C++ Algorithms
     94cppad-20160318: A Package for Differentiation of C++ Algorithms
    9595$$
    9696$mindex AD algorithmic differentiation automatic C++ algorithm derivative CppAD version cppad.hpp$$
  • trunk/example/CMakeLists.txt

    r3799 r3803  
    5656        add_to_list(check_depends check_example_ipopt_solve)
    5757ENDIF( ipopt_prefix )
    58 
    59 
    60 # Copy a file to another location and modify its contents.
    61 # configure_file(InputFile OutputFile [COPYONLY] [ESCAPE_QUOTES] [@ONLY])
    62 CONFIGURE_FILE(
    63         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh.in
    64         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh
    65 )
    6658
    6759
  • trunk/example/atomic/CMakeLists.txt

    r3802 r3803  
    1515# empty, Debug, Release, RelWithDebInfo and MinSizeRel
    1616SET(CMAKE_BUILD_TYPE DEBUG)
    17 #
    18 CONFIGURE_FILE(
    19         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh.in
    20         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh
    21 )
    2217#
    2318ADD_EXECUTABLE(example_atomic EXCLUDE_FROM_ALL
  • trunk/example/ipopt_solve/CMakeLists.txt

    r3788 r3803  
    1919LINK_DIRECTORIES( ${ipopt_LIBRARY_DIRS} )
    2020
    21 # Copy a file to another location and modify its contents.
    22 # configure_file(InputFile OutputFile [COPYONLY] [ESCAPE_QUOTES] [@ONLY])
    23 CONFIGURE_FILE(
    24         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh.in
    25         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh
    26 )
    27 
    2821#
    2922ADD_EXECUTABLE(example_ipopt_solve EXCLUDE_FROM_ALL
    30         solve.cpp
    3123        get_started.cpp
     24        ipopt_solve.cpp
    3225        ode_inverse.cpp
    3326        retape.cpp
  • trunk/example/ipopt_solve/makefile.am

    r3779 r3803  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
     
    3232#
    3333solve_SOURCES   = \
    34         solve.cpp \
    3534        get_started.cpp \
     35        ipopt_solve.cpp \
    3636        ode_inverse.cpp \
    3737        retape.cpp
  • trunk/example/ipopt_solve/makefile.in

    r3793 r3803  
    9898CONFIG_CLEAN_FILES = test.sh
    9999CONFIG_CLEAN_VPATH_FILES =
    100 am_solve_OBJECTS = solve.$(OBJEXT) get_started.$(OBJEXT) \
     100am_solve_OBJECTS = get_started.$(OBJEXT) ipopt_solve.$(OBJEXT) \
    101101        ode_inverse.$(OBJEXT) retape.$(OBJEXT)
    102102solve_OBJECTS = $(am_solve_OBJECTS)
     
    194194# $Id$
    195195# -----------------------------------------------------------------------------
    196 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
     196# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
    197197#
    198198# CppAD is distributed under multiple licenses. This distribution is under
     
    355355#
    356356solve_SOURCES = \
    357         solve.cpp \
    358357        get_started.cpp \
     358        ipopt_solve.cpp \
    359359        ode_inverse.cpp \
    360360        retape.cpp
     
    410410
    411411@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_started.Po@am__quote@
     412@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipopt_solve.Po@am__quote@
    412413@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ode_inverse.Po@am__quote@
    413414@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/retape.Po@am__quote@
    414 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solve.Po@am__quote@
    415415
    416416.cpp.o:
  • trunk/example/makefile.am

    r3799 r3803  
    5252# auto-tools does not support use of colpack
    5353EXTRA_DIST        =  \
    54         test_one.sh.in \
    5554        colpack_hes.cpp \
    5655        colpack_jac.cpp \
  • trunk/example/makefile.in

    r3799 r3803  
    9797DIST_COMMON = $(srcdir)/makefile.am $(am__DIST_COMMON)
    9898mkinstalldirs = $(install_sh) -d
    99 CONFIG_CLEAN_FILES = test_one.sh
     99CONFIG_CLEAN_FILES =
    100100CONFIG_CLEAN_VPATH_FILES =
    101101LIBRARIES = $(noinst_LIBRARIES)
     
    280280ETAGS = etags
    281281CTAGS = ctags
    282 am__DIST_COMMON = $(srcdir)/makefile.in $(srcdir)/test_one.sh.in \
    283         $(top_srcdir)/depcomp
     282am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/depcomp
    284283DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    285284ABS_TOP_BUILDDIR = @ABS_TOP_BUILDDIR@
     
    487486# auto-tools does not support use of colpack
    488487EXTRA_DIST = \
    489         test_one.sh.in \
    490488        colpack_hes.cpp \
    491489        colpack_jac.cpp \
     
    684682        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    685683$(am__aclocal_m4_deps):
    686 test_one.sh: $(top_builddir)/config.status $(srcdir)/test_one.sh.in
    687         cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
    688684
    689685clean-noinstLIBRARIES:
  • trunk/omh/install/download.omh

    r3802 r3803  
    9797$rnext
    9898current  $cnext EPL $cnext $href%
    99 http://www.coin-or.org/download/source/CppAD/cppad-20160317.epl.tgz%
    100 cppad-20160317.epl.tgz%$$
     99http://www.coin-or.org/download/source/CppAD/cppad-20160318.epl.tgz%
     100cppad-20160318.epl.tgz%$$
    101101$rnext
    102102current  $cnext GPL $cnext $href%
    103 http://www.coin-or.org/download/source/CppAD/cppad-20160317.gpl.tgz%
    104 cppad-20160317.gpl.tgz%$$
     103http://www.coin-or.org/download/source/CppAD/cppad-20160318.gpl.tgz%
     104cppad-20160318.gpl.tgz%$$
    105105$tend
    106106
  • trunk/test_more/CMakeLists.txt

    r3793 r3803  
    4646        SET(eigen_libs "")
    4747ENDIF ( eigen_prefix )
    48 
    49 # Copy a file to another location and modify its contents.
    50 # configure_file(InputFile OutputFile [COPYONLY] [ESCAPE_QUOTES] [@ONLY])
    51 CONFIGURE_FILE(
    52         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh.in
    53         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh
    54 )
    5548
    5649# add_executable(<name> [WIN32] [MACOSX_BUNDLE] [EXCLUDE_FROM_ALL]
  • trunk/test_more/makefile.am

    r3793 r3803  
    6565# Microsoft project files and script to run a single test
    6666EXTRA_DIST        =  \
    67         test_one.sh.in  \
    6867        $(ADOLC_EXTRA_FILES) \
    6968        $(IPOPT_EXTRA_FILES) \
  • trunk/test_more/makefile.in

    r3794 r3803  
    9797DIST_COMMON = $(srcdir)/makefile.am $(am__DIST_COMMON)
    9898mkinstalldirs = $(install_sh) -d
    99 CONFIG_CLEAN_FILES = test_one.sh
     99CONFIG_CLEAN_FILES =
    100100CONFIG_CLEAN_VPATH_FILES =
    101101LIBRARIES = $(noinst_LIBRARIES)
     
    256256ETAGS = etags
    257257CTAGS = ctags
    258 am__DIST_COMMON = $(srcdir)/makefile.in $(srcdir)/test_one.sh.in \
    259         $(top_srcdir)/depcomp
     258am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/depcomp
    260259DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    261260ABS_TOP_BUILDDIR = @ABS_TOP_BUILDDIR@
     
    474473# Microsoft project files and script to run a single test
    475474EXTRA_DIST = \
    476         test_one.sh.in  \
    477475        $(ADOLC_EXTRA_FILES) \
    478476        $(IPOPT_EXTRA_FILES) \
     
    631629        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    632630$(am__aclocal_m4_deps):
    633 test_one.sh: $(top_builddir)/config.status $(srcdir)/test_one.sh.in
    634         cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
    635631
    636632clean-noinstLIBRARIES:
Note: See TracChangeset for help on using the changeset viewer.