Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 335108 | Differences between
and this patch

Collapse All | Expand All

(-)Modules/FindBoost.cmake (-16 / +1 lines)
Lines 449-472 Link Here
449
    "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
449
    "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
450
    "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
450
    "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
451
else(Boost_FIND_VERSION_EXACT)
451
else(Boost_FIND_VERSION_EXACT)
452
453
  # Determine the system default library.
454
  execute_process(
455
    COMMAND "gawk" "$2 == \"BOOST_LIB_VERSION\" {print $3}" "/usr/include/boost/version.hpp"
456
    COMMAND "sed" "-e" "s/_/./g;s/\"//g"
457
    OUTPUT_VARIABLE _boost_SELECTED)
458
459
  # Determine the version without the ".0" or ".1", in case that finds it
460
  # better.
461
  string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1.\\2"
462
    _boost_SELECTED_NO_PATCH ${_boost_SELECTED})
463
464
  # The user has not requested an exact version.  Among known
452
  # The user has not requested an exact version.  Among known
465
  # versions, find those that are acceptable to the user request.
453
  # versions, find those that are acceptable to the user request.
466
  set(_Boost_KNOWN_VERSIONS
454
  set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
467
    ${_boost_SELECTED}
468
    ${_boost_SELECTED_NO_PATCH}
469
    ${Boost_ADDITIONAL_VERSIONS}
470
    "1.46.1"
455
    "1.46.1"
471
    "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42"
456
    "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42"
472
    "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
457
    "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"

Return to bug 335108