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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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)
Note: See TracChangeset for help on using the changeset viewer.