Changeset 3803 for trunk/CMakeLists.txt


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/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
Note: See TracChangeset for help on using the changeset viewer.