Changeset 3975


Ignore:
Timestamp:
Aug 30, 2017 7:14:04 PM (2 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 6c91cf99333caff66704c4a13f2ea07e53bb58cd
end hash code: 6c98eba3dfcaa5729815e25993b88994ea7c685d

commit 6c98eba3dfcaa5729815e25993b88994ea7c685d
Author: Brad Bell <bradbell@…>
Date: Wed Aug 30 15:57:24 2017 -0700

Fix problem running tests when cppad_cxx_flags not specified.

commit 63a6be29dba0ce4f7a3c67fb30a25b7f1799ff4d
Author: Brad Bell <bradbell@…>
Date: Wed Aug 30 15:29:57 2017 -0700

Fix cmake warning about non-existent dependency.

Location:
trunk
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3973 r3975  
    5959INCLUDE(cmake/optional_package.cmake)
    6060#
    61 # add_cppad_cxx_flags(target_name)
    62 INCLUDE(cmake/add_cppad_cxx_flags.cmake)
    63 #
    6461# check_source_runs(source variable)
    6562INCLUDE(cmake/check_source_runs.cmake)
     
    120117# -----------------------------------------------------------------------------
    121118# cppad_cxx_flags
    122 command_line_arg(cppad_cxx_flags NOTFOUND STRING
     119command_line_arg(cppad_cxx_flags "" STRING
    123120        "compile flags used with cppad (besides debug, release, and profile flags)"
    124121)
     
    192189ENDIF( cppad_deprecated )
    193190# =============================================================================
    194 # cppad_has_colpack, colpack_libs, cppad_lib
     191# colpack_libs, cppad_lib
    195192#
    196193IF( cppad_has_colpack )
    197         SET(cppad_has_colpack 1)
    198194        SET( colpack_libs "ColPack" )
    199         SET( cppad_lib "cppad_lib" )
     195        SET( cppad_lib    "cppad_lib" )
    200196ELSE( cppad_has_colpack )
    201         SET(cppad_has_colpack 0)
    202197        SET( colpack_libs "" )
    203         SET( cppad_lib "" )
     198        SET( cppad_lib    "" )
    204199ENDIF( cppad_has_colpack )
    205200# =============================================================================
  • trunk/cppad/local/CMakeLists.txt

    r3973 r3975  
    6767                SET(is_pod_specialize_11 "${is_pod_specialize_11}${line}")
    6868        ENDIF( ${pod_type_var} )
    69         print_variable(is_pod_specialize_11)
    7069ENDFOREACH(pod_type)
    7170# -----------------------------------------------------------------------------
  • trunk/omh/appendix/whats_new/whats_new_17.omh

    r3973 r3975  
    4141        boolofvoid
    4242        namespace
     43        cxx
    4344$$
    4445
     
    4849Speed tests no longer automatically compile in release mode; see
    4950$cref/debug_which/speed/debug_which/$$
     51
     52$head 08-30$$
     53$list number$$
     54If $cref colpack_prefix$$ was not specified, one would get the following
     55waring during the $cref cmake$$ command:
     56$codei%
     57        Policy CMP0046 is not set: Error on non-existent dependency in
     58%$$
     59This has been fixed by not adding the dependency when it is not needed.
     60$lnext
     61There was a problem running $cref/make check/cmake_check/$$
     62when $cref/cppad_cxx_flags/cmake/cppad_cxx_flags/$$ was not specified.
     63This has been fixed.
     64This was probably introduced on $cref/05-29/whats_new_17/05-29/$$.
     65$lend
     66
    5067
    5168$head 08-29$$
  • trunk/test_more/compare_c/CMakeLists.txt

    r3941 r3975  
    6060        IF( ${com} STREQUAL cpp )
    6161                # These are C++ compiler flags (may not be valid for C)
    62                 add_cppad_cxx_flags(det_by_minor_${com})
     62                SET_TARGET_PROPERTIES(
     63                        det_by_minor_${com} PROPERTIES COMPILE_FLAGS "${cppad_cxx_flags}"
     64                )
    6365        ENDIF( ${com} STREQUAL cpp )
    6466        #
  • trunk/test_more/general/CMakeLists.txt

    r3941 r3975  
    141141#
    142142# must first build cppad_lib
    143 ADD_DEPENDENCIES(test_more_general cppad_lib)
    144 #
    145 # Compiler flags for cppad source
    146 add_cppad_cxx_flags(test_more_general)
     143STRING(COMPARE EQUAL "${cppad_lib}" "" empty_cppad_lib )
     144IF( NOT  empty_cppad_lib )
     145        ADD_DEPENDENCIES(test_more_general ${cppad_lib} )
     146ENDIF( NOT  empty_cppad_lib )
    147147#
    148148# List of libraries to be linked into the specified target
Note: See TracChangeset for help on using the changeset viewer.