From 29c5f57c9573adc11ad9897bbda3e632a28a0ead Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 8 Jan 2026 18:19:15 +0200 Subject: [PATCH] Define BOOST_UUID_REPORT_IMPLEMENTATION in test .cpp files instead of Jamfile --- test/CMakeLists.txt | 32 ++++++++++++++++---------------- test/Jamfile.v2 | 38 ++++++++++++++++++-------------------- test/test_comparison.cpp | 2 ++ test/test_from_chars.cpp | 2 ++ test/test_from_chars_2.cpp | 2 ++ test/test_io.cpp | 2 ++ test/test_io_2.cpp | 2 ++ test/test_to_chars.cpp | 2 ++ test/test_to_chars_2.cpp | 2 ++ test/test_uuid.cpp | 2 ++ test/test_uuid_cx3.cpp | 2 ++ 11 files changed, 52 insertions(+), 36 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7478941..ac40240 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,8 +13,8 @@ find_package(Threads REQUIRED) set(BOOST_TEST_LINK_LIBRARIES Boost::uuid Boost::core) -boost_test(TYPE run SOURCES test_uuid.cpp LINK_LIBRARIES Boost::container_hash COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1) -boost_test(TYPE run SOURCES test_uuid.cpp LINK_LIBRARIES Boost::container_hash COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_uuid_no_simd) +boost_test(TYPE run SOURCES test_uuid.cpp LINK_LIBRARIES Boost::container_hash) +boost_test(TYPE run SOURCES test_uuid.cpp LINK_LIBRARIES Boost::container_hash COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_uuid_no_simd) boost_test(TYPE run SOURCES test_uuid_2.cpp) boost_test(TYPE run SOURCES test_uuid_3.cpp) @@ -24,25 +24,25 @@ boost_test(TYPE run SOURCES test_attribute_packed.cpp) boost_test(TYPE run SOURCES test_pragma_pack.cpp) boost_test(TYPE run SOURCES test_data.cpp) -boost_test(TYPE run SOURCES test_comparison.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1) -boost_test(TYPE run SOURCES test_comparison.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_comparison_no_simd) +boost_test(TYPE run SOURCES test_comparison.cpp) +boost_test(TYPE run SOURCES test_comparison.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_comparison_no_simd) boost_test(TYPE run SOURCES test_include1.cpp test_include2.cpp) -boost_test(TYPE run SOURCES test_io.cpp LINK_LIBRARIES Boost::lexical_cast Boost::predef COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1) -boost_test(TYPE run SOURCES test_io.cpp LINK_LIBRARIES Boost::lexical_cast Boost::predef COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_io_no_simd) -boost_test(TYPE run SOURCES test_io_2.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1) -boost_test(TYPE run SOURCES test_io_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_io_2_no_simd) +boost_test(TYPE run SOURCES test_io.cpp LINK_LIBRARIES Boost::lexical_cast Boost::predef) +boost_test(TYPE run SOURCES test_io.cpp LINK_LIBRARIES Boost::lexical_cast Boost::predef COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_io_no_simd) +boost_test(TYPE run SOURCES test_io_2.cpp) +boost_test(TYPE run SOURCES test_io_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_io_2_no_simd) -boost_test(TYPE run SOURCES test_to_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1) -boost_test(TYPE run SOURCES test_to_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_to_chars_no_simd) -boost_test(TYPE run SOURCES test_to_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1) -boost_test(TYPE run SOURCES test_to_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_to_chars_2_no_simd) +boost_test(TYPE run SOURCES test_to_chars.cpp) +boost_test(TYPE run SOURCES test_to_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_to_chars_no_simd) +boost_test(TYPE run SOURCES test_to_chars_2.cpp) +boost_test(TYPE run SOURCES test_to_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_to_chars_2_no_simd) -boost_test(TYPE run SOURCES test_from_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1) -boost_test(TYPE run SOURCES test_from_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_from_chars_no_simd) -boost_test(TYPE run SOURCES test_from_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1) -boost_test(TYPE run SOURCES test_from_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_from_chars_2_no_simd) +boost_test(TYPE run SOURCES test_from_chars.cpp) +boost_test(TYPE run SOURCES test_from_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_from_chars_no_simd) +boost_test(TYPE run SOURCES test_from_chars_2.cpp) +boost_test(TYPE run SOURCES test_from_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 NAME test_from_chars_2_no_simd) boost_test(TYPE run SOURCES test_uuid_from_string.cpp) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index dd1008a..23109a5 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -74,8 +74,8 @@ run test_include1.cpp test_include2.cpp ; # main tests run test_uuid.cpp - : : : /boost/container_hash//boost_container_hash BOOST_UUID_REPORT_IMPLEMENTATION ; -run test_uuid.cpp : : : /boost/container_hash//boost_container_hash BOOST_UUID_NO_SIMD BOOST_UUID_REPORT_IMPLEMENTATION : test_uuid_no_simd ; + : : : /boost/container_hash//boost_container_hash ; +run test_uuid.cpp : : : /boost/container_hash//boost_container_hash BOOST_UUID_NO_SIMD : test_uuid_no_simd ; run test_uuid_2.cpp ; run test_uuid_3.cpp ; @@ -90,28 +90,27 @@ run test_data.cpp ; # test comparison -run test_comparison.cpp - : : : BOOST_UUID_REPORT_IMPLEMENTATION ; -run test_comparison.cpp : : : BOOST_UUID_NO_SIMD BOOST_UUID_REPORT_IMPLEMENTATION : test_comparison_no_simd ; +run test_comparison.cpp ; +run test_comparison.cpp : : : BOOST_UUID_NO_SIMD : test_comparison_no_simd ; # test uuid_io.hpp run test_io.cpp - : : : /boost/lexical_cast//boost_lexical_cast /boost/predef//boost_predef BOOST_UUID_REPORT_IMPLEMENTATION -$(WERROR) ; + : : : /boost/lexical_cast//boost_lexical_cast /boost/predef//boost_predef -$(WERROR) ; run test_io.cpp - : : : /boost/lexical_cast//boost_lexical_cast /boost/predef//boost_predef BOOST_UUID_NO_SIMD BOOST_UUID_REPORT_IMPLEMENTATION -$(WERROR) : test_io_no_simd ; -run test_io_2.cpp : : : BOOST_UUID_REPORT_IMPLEMENTATION ; -run test_io_2.cpp : : : BOOST_UUID_NO_SIMD BOOST_UUID_REPORT_IMPLEMENTATION : test_io_2_no_simd ; + : : : /boost/lexical_cast//boost_lexical_cast /boost/predef//boost_predef BOOST_UUID_NO_SIMD -$(WERROR) : test_io_no_simd ; +run test_io_2.cpp ; +run test_io_2.cpp : : : BOOST_UUID_NO_SIMD : test_io_2_no_simd ; -run test_to_chars.cpp : : : BOOST_UUID_REPORT_IMPLEMENTATION ; -run test_to_chars.cpp : : : BOOST_UUID_NO_SIMD BOOST_UUID_REPORT_IMPLEMENTATION : test_to_chars_no_simd ; -run test_to_chars_2.cpp : : : BOOST_UUID_REPORT_IMPLEMENTATION ; -run test_to_chars_2.cpp : : : BOOST_UUID_NO_SIMD BOOST_UUID_REPORT_IMPLEMENTATION : test_to_chars_2_no_simd ; +run test_to_chars.cpp ; +run test_to_chars.cpp : : : BOOST_UUID_NO_SIMD : test_to_chars_no_simd ; +run test_to_chars_2.cpp ; +run test_to_chars_2.cpp : : : BOOST_UUID_NO_SIMD : test_to_chars_2_no_simd ; -run test_from_chars.cpp : : : BOOST_UUID_REPORT_IMPLEMENTATION ; -run test_from_chars.cpp : : : BOOST_UUID_NO_SIMD BOOST_UUID_REPORT_IMPLEMENTATION : test_from_chars_no_simd ; -run test_from_chars_2.cpp : : : BOOST_UUID_REPORT_IMPLEMENTATION ; -run test_from_chars_2.cpp : : : BOOST_UUID_NO_SIMD BOOST_UUID_REPORT_IMPLEMENTATION : test_from_chars_2_no_simd ; +run test_from_chars.cpp ; +run test_from_chars.cpp : : : BOOST_UUID_NO_SIMD : test_from_chars_no_simd ; +run test_from_chars_2.cpp ; +run test_from_chars_2.cpp : : : BOOST_UUID_NO_SIMD : test_from_chars_2_no_simd ; run test_uuid_from_string.cpp ; run test_uuid_from_string_2.cpp ; @@ -235,9 +234,8 @@ run test_constants.cpp ; compile test_uuid_cx.cpp ; run test_uuid_cx2.cpp ; -run test_uuid_cx3.cpp - : : : BOOST_UUID_REPORT_IMPLEMENTATION ; -run test_uuid_cx3.cpp : : : BOOST_UUID_NO_SIMD BOOST_UUID_REPORT_IMPLEMENTATION : test_uuid_cx3_no_simd ; +run test_uuid_cx3.cpp ; +run test_uuid_cx3.cpp : : : BOOST_UUID_NO_SIMD : test_uuid_cx3_no_simd ; run test_hash_value_cx.cpp ; diff --git a/test/test_comparison.cpp b/test/test_comparison.cpp index 522c6b0..90d5e02 100644 --- a/test/test_comparison.cpp +++ b/test/test_comparison.cpp @@ -2,6 +2,8 @@ // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt +#define BOOST_UUID_REPORT_IMPLEMENTATION + #include #include #include diff --git a/test/test_from_chars.cpp b/test/test_from_chars.cpp index 5b333a9..ba4fcb4 100644 --- a/test/test_from_chars.cpp +++ b/test/test_from_chars.cpp @@ -2,6 +2,8 @@ // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt +#define BOOST_UUID_REPORT_IMPLEMENTATION + #include #include #include diff --git a/test/test_from_chars_2.cpp b/test/test_from_chars_2.cpp index 4fb5313..c5f7bd0 100644 --- a/test/test_from_chars_2.cpp +++ b/test/test_from_chars_2.cpp @@ -2,6 +2,8 @@ // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt +#define BOOST_UUID_REPORT_IMPLEMENTATION + #include #include #include diff --git a/test/test_io.cpp b/test/test_io.cpp index 86e476b..acbfd0a 100644 --- a/test/test_io.cpp +++ b/test/test_io.cpp @@ -9,6 +9,8 @@ // libs/uuid/test/test_io.cpp -------------------------------// +#define BOOST_UUID_REPORT_IMPLEMENTATION + #include #include #include diff --git a/test/test_io_2.cpp b/test/test_io_2.cpp index 332d199..540e070 100644 --- a/test/test_io_2.cpp +++ b/test/test_io_2.cpp @@ -3,6 +3,8 @@ // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt +#define BOOST_UUID_REPORT_IMPLEMENTATION + #include #include #include diff --git a/test/test_to_chars.cpp b/test/test_to_chars.cpp index e0c07fb..a3fd90b 100644 --- a/test/test_to_chars.cpp +++ b/test/test_to_chars.cpp @@ -3,6 +3,8 @@ // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt +#define BOOST_UUID_REPORT_IMPLEMENTATION + #include #include #include diff --git a/test/test_to_chars_2.cpp b/test/test_to_chars_2.cpp index 7ac121b..efbed2c 100644 --- a/test/test_to_chars_2.cpp +++ b/test/test_to_chars_2.cpp @@ -3,6 +3,8 @@ // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt +#define BOOST_UUID_REPORT_IMPLEMENTATION + #include #include #include diff --git a/test/test_uuid.cpp b/test/test_uuid.cpp index 603b51b..9aeb5bc 100644 --- a/test/test_uuid.cpp +++ b/test/test_uuid.cpp @@ -9,6 +9,8 @@ // libs/uuid/test/test_uuid.cpp -------------------------------// +#define BOOST_UUID_REPORT_IMPLEMENTATION + #include #include #include diff --git a/test/test_uuid_cx3.cpp b/test/test_uuid_cx3.cpp index bb4a6fa..f4313c1 100644 --- a/test/test_uuid_cx3.cpp +++ b/test/test_uuid_cx3.cpp @@ -2,6 +2,8 @@ // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt +#define BOOST_UUID_REPORT_IMPLEMENTATION + #include #include #include