Skip to content

Commit

Permalink
Updated to Boost 1.67.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Orphis
Cameron Lowell Palmer authored and Orphis committed Jul 16, 2018
1 parent 6c418d1 commit 9bc12ea
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 86 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.0.0)
project(Boost-CMake)

option(BOOST_DOWNLOAD_TO_BINARY_DIR "Prefer downloading Boost to the binary directory instead of source directory" OFF)
set(BOOST_URL "https://github.com/Orphis/boost-cmake/releases/download/v1.64.0/boost_1_64_0.tar.xz" CACHE STRING "Boost download URL")
set(BOOST_URL_SHA256 "d964dfdab2f73d04a8f52303f1b141344447b78ab85dc79da78fa167fdd807f5" CACHE STRING "Boost download URL SHA256 checksum")
set(BOOST_URL "https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2" CACHE STRING "Boost download URL")
set(BOOST_URL_SHA256 "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba" CACHE STRING "Boost download URL SHA256 checksum")
set(BOOST_ARCHIVE_DIRECTORY "" CACHE DIRECTORY "Use the specified local directory to search for boost archives instead of downloading them" )

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
Expand Down
4 changes: 3 additions & 1 deletion libs/context.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,7 @@ _add_boost_test(
RUN ${BOOST_SOURCE}/libs/context/test/test_invoke.cpp
RUN ${BOOST_SOURCE}/libs/context/test/test_apply.cpp
RUN ${BOOST_SOURCE}/libs/context/test/test_fcontext.cpp
RUN ${BOOST_SOURCE}/libs/context/test/test_execution_context.cpp
RUN ${BOOST_SOURCE}/libs/context/test/test_fiber.cpp
RUN ${BOOST_SOURCE}/libs/context/test/test_callcc.cpp
RUN ${BOOST_SOURCE}/libs/context/test/test_execution_context_v2.cpp
)
1 change: 0 additions & 1 deletion libs/exception.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,4 @@ _add_boost_test(
RUN ${BOOST_SOURCE}/libs/exception/test/current_exception_cast_test.cpp
RUN ${BOOST_SOURCE}/libs/exception/test/errinfos_test.cpp
RUN ${BOOST_SOURCE}/libs/exception/test/exception_ptr_test.cpp
RUN ${BOOST_SOURCE}/libs/exception/test/N3757_test.cpp
)
156 changes: 77 additions & 79 deletions libs/random.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,110 +12,108 @@ _add_boost_test(
Boost::random
Boost::unit_test_framework
TESTS
RUN ${BOOST_SOURCE}/libs/random/test/histogram.cpp
RUN ${BOOST_SOURCE}/libs/random/test/multiprecision_float_test.cpp
RUN ${BOOST_SOURCE}/libs/random/test/multiprecision_int_test.cpp
# RUN ${BOOST_SOURCE}/libs/random/test/statistic_tests.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_bernoulli.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_bernoulli_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_beta.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_beta_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_binomial.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_binomial_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_cauchy.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_cauchy_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_chi_squared.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_chi_squared_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_const_mod.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_generate_canonical.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_random_number_generator.cpp
RUN ${BOOST_SOURCE}/libs/random/example/random_demo.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_random_device.cpp

RUN ${BOOST_SOURCE}/libs/random/test/test_minstd_rand0.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_minstd_rand.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_rand48.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_mt11213b.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_mt19937.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_mt19937_64.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_discrete.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_discrete_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ecuyer1988.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_exponential.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_exponential_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_extreme_value.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_extreme_value_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_fisher_f.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_fisher_f_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_gamma.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_gamma_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_generate_canonical.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_geometric.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_geometric_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_hellekalek1995.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_linear_feedback_shift.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_taus88.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_kreutzer1986.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux3.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux4.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux3_01.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux4_01.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux64_4.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux64_3.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux64_3_01.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux64_4_01.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux24_base.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux24.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux48_base.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux48.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_knuth_b.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_hyperexponential.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_hyperexponential_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_independent_bits31.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_independent_bits32.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_knuth_b.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_kreutzer1986.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci607.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci1279.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci19937.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci2281.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci23209.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci3217.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci4423.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci9689.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci19937.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci23209.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci44497.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_zero_seed.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_seed_seq.cpp

RUN ${BOOST_SOURCE}/libs/random/test/test_binomial.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_binomial_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_poisson.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_poisson_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_discrete.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_discrete_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_gamma.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_gamma_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_weibull.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_weibull_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_extreme_value.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_extreme_value_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci607.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lagged_fibonacci9689.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_laplace.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_laplace_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_linear_feedback_shift.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lognormal.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lognormal_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_minstd_rand.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_minstd_rand0.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_mt11213b.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_mt19937.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_mt19937_64.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_negative_binomial.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_negative_binomial_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_chi_squared.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_chi_squared_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_fisher_f.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_fisher_f_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_student_t.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_student_t_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_non_central_chi_squared.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_non_central_chi_squared_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_normal.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_normal_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_old_uniform_int.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_old_uniform_int_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_old_uniform_real.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_old_uniform_real_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_piecewise_constant.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_piecewise_constant_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_piecewise_linear.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_piecewise_linear_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_exponential.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_exponential_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_bernoulli.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_bernoulli_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_cauchy.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_cauchy_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_geometric.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_geometric_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lognormal.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_lognormal_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_poisson.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_poisson_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_rand48.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_random_device.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_random_number_generator.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux24.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux24_base.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux3.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux3_01.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux4.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux48.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux48_base.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux4_01.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux64_3.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux64_3_01.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux64_4.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_ranlux64_4_01.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_seed_seq.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_student_t.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_student_t_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_taus88.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_triangle.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_triangle_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_int.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_int_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_real.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_real_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_on_sphere.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_on_sphere_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_real.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_real_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_smallint.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_uniform_smallint_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_old_uniform_real.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_old_uniform_real_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_old_uniform_int.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_old_uniform_int_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_beta.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_beta_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_laplace.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_laplace_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_non_central_chi_squared.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_non_central_chi_squared_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_hyperexponential.cpp
# RUN ${BOOST_SOURCE}/libs/random/test/test_hyperexponential_distribution.cpp

RUN ${BOOST_SOURCE}/libs/random/test/multiprecision_int_test.cpp
RUN ${BOOST_SOURCE}/libs/random/test/multiprecision_float_test.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_weibull.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_weibull_distribution.cpp
RUN ${BOOST_SOURCE}/libs/random/test/test_zero_seed.cpp
)
1 change: 0 additions & 1 deletion libs/serialization.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ _add_boost_lib(
${BOOST_SOURCE}/libs/serialization/src/extended_type_info_typeid.cpp
${BOOST_SOURCE}/libs/serialization/src/polymorphic_iarchive.cpp
${BOOST_SOURCE}/libs/serialization/src/polymorphic_oarchive.cpp
${BOOST_SOURCE}/libs/serialization/src/singleton.cpp
${BOOST_SOURCE}/libs/serialization/src/stl_port.cpp
${BOOST_SOURCE}/libs/serialization/src/text_iarchive.cpp
${BOOST_SOURCE}/libs/serialization/src/text_oarchive.cpp
Expand Down
3 changes: 2 additions & 1 deletion libs/test.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ _add_boost_lib(
${BOOST_SOURCE}/libs/test/src/decorator.cpp
${BOOST_SOURCE}/libs/test/src/execution_monitor.cpp
${BOOST_SOURCE}/libs/test/src/framework.cpp
${BOOST_SOURCE}/libs/test/src/junit_log_formatter.cpp
${BOOST_SOURCE}/libs/test/src/plain_report_formatter.cpp
${BOOST_SOURCE}/libs/test/src/progress_monitor.cpp
${BOOST_SOURCE}/libs/test/src/results_collector.cpp
${BOOST_SOURCE}/libs/test/src/results_reporter.cpp
${BOOST_SOURCE}/libs/test/src/test_framework_init_observer.cpp
${BOOST_SOURCE}/libs/test/src/test_tools.cpp
${BOOST_SOURCE}/libs/test/src/test_tree.cpp
${BOOST_SOURCE}/libs/test/src/unit_test_log.cpp
${BOOST_SOURCE}/libs/test/src/unit_test_main.cpp
${BOOST_SOURCE}/libs/test/src/unit_test_monitor.cpp
${BOOST_SOURCE}/libs/test/src/unit_test_parameters.cpp
${BOOST_SOURCE}/libs/test/src/junit_log_formatter.cpp
${BOOST_SOURCE}/libs/test/src/xml_log_formatter.cpp
${BOOST_SOURCE}/libs/test/src/xml_report_formatter.cpp
LINK
Expand Down
2 changes: 1 addition & 1 deletion repack.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

BOOST_VERSION=1.64.0
BOOST_VERSION=1.67.0

function finish {
rm -rf ${tmp_dir}
Expand Down

0 comments on commit 9bc12ea

Please sign in to comment.