boostorg · anarthal · Dec 22, 2024 · Dec 22, 2024 · Dec 30, 2024 · Dec 30, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,10 @@ target_link_libraries(boost_assert
     Boost::config
 )
 
+if (BOOST_USE_MODULES)
+  target_compile_definitions(boost_assert INTERFACE BOOST_USE_MODULES)
+endif()
+
 # Add headers and .natvis to project, for better IDE integration
 
 if(NOT CMAKE_VERSION VERSION_LESS 3.19)

diff --git a/include/boost/assert.hpp b/include/boost/assert.hpp
@@ -29,6 +29,14 @@
 // BOOST_ASSERT, BOOST_ASSERT_MSG, BOOST_ASSERT_IS_VOID
 //
 
+// Make the header safe to include from libraries supporting modules
+#if defined(BOOST_IN_MODULE_PURVIEW) && !defined(BOOST_ASSERT)
+#  error "Please #include <boost/assert.hpp> in your module global fragment"
+#endif
+
+// Don't include the file again in module purviews
+#ifndef BOOST_IN_MODULE_PURVIEW
+
 #undef BOOST_ASSERT
 #undef BOOST_ASSERT_MSG
 #undef BOOST_ASSERT_IS_VOID
@@ -88,4 +96,6 @@ namespace boost
 # define BOOST_VERIFY(expr) BOOST_ASSERT(expr)
 # define BOOST_VERIFY_MSG(expr, msg) BOOST_ASSERT_MSG(expr,msg)
 
+#endif // BOOST_IN_MODULE_PURVIEW
+
 #endif
diff --git a/include/boost/assert/source_location.hpp b/include/boost/assert/source_location.hpp
@@ -1,3 +1,8 @@
+// Make the header safe to include from libraries supporting modules
+#if defined(BOOST_IN_MODULE_PURVIEW) && !defined(BOOST_ASSERT_SOURCE_LOCATION_HPP_INCLUDED)
+#  error "Please #include <boost/assert/source_location.hpp> in your module global fragment"
+#endif
+
 #ifndef BOOST_ASSERT_SOURCE_LOCATION_HPP_INCLUDED
 #define BOOST_ASSERT_SOURCE_LOCATION_HPP_INCLUDED
 
@@ -9,16 +14,16 @@
 
 #include <boost/config.hpp>
 #include <boost/cstdint.hpp>
-#include <string>
-#include <cstdio>
-#include <cstring>
+#include <boost/config/std/string.hpp>
+#include <boost/config/std/cstdio.hpp>
+#include <boost/config/std/cstring.hpp>
 
 #if !defined(BOOST_NO_IOSTREAM)
-#include <iosfwd>
+#include <boost/config/std/iosfwd.hpp>
 #endif
 
 #if defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L
-# include <source_location>
+# include <boost/config/std/source_location.hpp>
 #endif
 
 namespace boost

diff --git a/include/boost/current_function.hpp b/include/boost/current_function.hpp
@@ -1,3 +1,8 @@
+// Make the header safe to include from libraries supporting modules
+#if defined(BOOST_IN_MODULE_PURVIEW) && !defined(BOOST_CURRENT_FUNCTION_HPP_INCLUDED)
+#  error "Please #include <boost/current_function.hpp> in your module global fragment"
+#endif
+
 #ifndef BOOST_CURRENT_FUNCTION_HPP_INCLUDED
 #define BOOST_CURRENT_FUNCTION_HPP_INCLUDED
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -6,6 +6,10 @@ include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
 
 if(HAVE_BOOST_TEST)
 
+if(BOOST_USE_MODULES)
+  set(CMAKE_CXX_MODULE_STD ON)
+endif()
+
 boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::assert Boost::core)
 
 endif()
diff --git a/test/assert_msg_test2.cpp b/test/assert_msg_test2.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/detail/lightweight_test.hpp>
-#include <stdio.h>
+#include <boost/config/std/cstdio.hpp>
 
 // default case, !NDEBUG
 // BOOST_ASSERT_MSG(x) -> assert(x)

diff --git a/test/assert_test.cpp b/test/assert_test.cpp
@@ -72,7 +72,7 @@ void test_disabled()
 #define BOOST_ENABLE_ASSERT_HANDLER
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <cstdio>
+#include <boost/config/std/cstdio.hpp>
 
 int handler_invoked = 0;
 int msg_handler_invoked = 0;

diff --git a/test/assert_test2.cpp b/test/assert_test2.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/detail/lightweight_test.hpp>
-#include <stdio.h>
+#include <boost/config/std/cstdio.hpp>
 
 // default case, !NDEBUG
 // BOOST_ASSERT(x) -> assert(x)

diff --git a/test/check_cmake_version.cpp b/test/check_cmake_version.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/core/lightweight_test.hpp>
 #include <boost/version.hpp>
-#include <cstdio>
+#include <boost/config/std/cstdio.hpp>
 
 int main( int ac, char const* av[] )
 {

diff --git a/test/current_function_test.cpp b/test/current_function_test.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/current_function.hpp>
 #include <boost/config.hpp>
-#include <cstdio>
+#include <boost/config/std/cstdio.hpp>
 
 void message(char const * file, long line, char const * func, char const * msg)
 {

diff --git a/test/current_function_test2.cpp b/test/current_function_test2.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/current_function.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <string>
+#include <boost/config/std/string.hpp>
 
 int f()
 {

diff --git a/test/exp/assert_exp_test.cpp b/test/exp/assert_exp_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/config.hpp>
 #include <boost/current_function.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#include <string>
+#include <boost/config/std/string.hpp>
 
 // Each backslash in __FILE__ when passed through BOOST_STRINGIZE is doubled
 static std::string quote( std::string const & s )

diff --git a/test/exp/assert_msg_exp_test.cpp b/test/exp/assert_msg_exp_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/config.hpp>
 #include <boost/current_function.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#include <string>
+#include <boost/config/std/string.hpp>
 
 // Each backslash in __FILE__ when passed through BOOST_STRINGIZE is doubled
 static std::string quote( std::string const & s )

diff --git a/test/exp/verify_exp_test.cpp b/test/exp/verify_exp_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/config.hpp>
 #include <boost/current_function.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#include <string>
+#include <boost/config/std/string.hpp>
 
 // default case, !NDEBUG
 // BOOST_VERIFY(x) -> BOOST_ASSERT(x)

diff --git a/test/exp/verify_msg_exp_test.cpp b/test/exp/verify_msg_exp_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/config.hpp>
 #include <boost/current_function.hpp>
 #include <boost/detail/lightweight_test.hpp>
-#include <string>
+#include <boost/config/std/string.hpp>
 
 // default case, !NDEBUG
 // BOOST_VERIFY_MSG(x,"m") -> BOOST_ASSERT_MSG(x,"m")

diff --git a/test/source_location_test.cpp b/test/source_location_test.cpp
@@ -4,7 +4,7 @@
 
 #include <boost/assert/source_location.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <cstring>
+#include <boost/config/std/cstring.hpp>
 
 static char const* adjust_filename( char const* file )
 {

diff --git a/test/source_location_test3.cpp b/test/source_location_test3.cpp
@@ -4,8 +4,8 @@
 
 #include <boost/assert/source_location.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <sstream>
-#include <cstring>
+#include <boost/config/std/sstream.hpp>
+#include <boost/config/std/cstring.hpp>
 
 static char const* adjust_filename( char const* file )
 {

diff --git a/test/source_location_test4.cpp b/test/source_location_test4.cpp
@@ -5,7 +5,7 @@
 #include <boost/assert/source_location.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
-#include <cstring>
+#include <boost/config/std/cstring.hpp>
 
 static char const* adjust_filename( char const* file )
 {

diff --git a/test/source_location_test5.cpp b/test/source_location_test5.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/assert/source_location.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <exception>
+#include <boost/config/std/exception.hpp>
 
 template<class T> class result
 {

diff --git a/test/verify_test.cpp b/test/verify_test.cpp
@@ -67,7 +67,7 @@ void test_disabled()
 #define BOOST_ENABLE_ASSERT_HANDLER
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <cstdio>
+#include <boost/config/std/cstdio.hpp>
 
 int handler_invoked = 0;
 

diff --git a/tools/install-cmake.sh b/tools/install-cmake.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Copyright (c) 2026 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+
+set -e
+
+wget https://github.com/Kitware/CMake/releases/download/v4.2.3/cmake-4.2.3-linux-x86_64.tar.gz
+tar -xf cmake-4.2.3-linux-x86_64.tar.gz
+mv cmake-4.2.3-linux-x86_64 /opt/cmake
+update-alternatives --install /usr/bin/cmake cmake /opt/cmake/bin/cmake 100
+update-alternatives --install /usr/bin/ctest ctest /opt/cmake/bin/ctest 100
diff --git a/tools/setup_boost_with_modules.py b/tools/setup_boost_with_modules.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python3
+
+# This is a temporary workaround to make CIs use the
+# "Boost with C++20 modules" proposal, instead of the regular develop branch
+# Call it instead of depinst
+
+from subprocess import run
+import os
+
+def main():
+
+    submodules = [
+        ('tools/cmake',         'https://github.com/anarthal/boost-cmake'),
+        ('libs/core',           'https://github.com/anarthal/core'),
+        ('libs/throw_exception','https://github.com/anarthal/throw_exception'),
+        ('libs/config',         'https://github.com/anarthal/config'),
+    ]
+
+    for submodule, url in submodules:
+        os.chdir(submodule)
+        run(['git', 'remote', 'add', 'modules', url])
+        run(['git', 'fetch', '--depth', '1', 'modules', 'feature/cxx20-modules'])
+        run(['git', 'checkout', 'modules/feature/cxx20-modules'])
+        os.chdir('../..')
+
+
+if __name__ == '__main__':
+    main()