[pull] develop from boostorg:develop

CMakeLists.txt

@@ -1,9 +1,9 @@
 # Generated by `boostdep --cmake lambda2`
-# Copyright 2020 Peter Dimov
+# Copyright 2020, 2021 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
-cmake_minimum_required(VERSION 3.5...3.16)
+cmake_minimum_required(VERSION 3.8...3.20)
 
 project(boost_lambda2 VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
 
@@ -12,9 +12,10 @@ add_library(Boost::lambda2 ALIAS boost_lambda2)
 
 target_include_directories(boost_lambda2 INTERFACE include)
 
+target_compile_features(boost_lambda2 INTERFACE cxx_std_14)
+
 if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
 
   add_subdirectory(test)
 
 endif()
-

build.jam

@@ -0,0 +1,16 @@
+# Copyright 2023-2024 René Ferdinand Rivera Morell
+# Copyright 2024 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# https://www.boost.org/LICENSE_1_0.txt
+
+require-b2 5.2 ;
+
+project /boost/lambda2 ;
+
+explicit
+    [ alias boost_lambda2 : : : : <include>include <library>$(boost_dependencies) ]
+    [ alias all : boost_lambda2 test ]
+    ;
+
+call-if : boost-library lambda2
+    ;

include/boost/lambda2/lambda2.hpp

@@ -14,7 +14,7 @@
 
 // Same format as BOOST_VERSION:
 //   major * 100000 + minor * 100 + patch
-#define BOOST_LAMBDA2_VERSION 107900
+#define BOOST_LAMBDA2_VERSION 108800
 
 namespace boost
 {

meta/libraries.json

@@ -10,5 +10,6 @@
     "description": "A C++14 lambda library.",
     "category": [
         "Function-objects"
-    ]
+    ],
+    "cxxstd": "14"
 }

test/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright 2018, 2019 Peter Dimov
+# 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
+
+include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
+
+if(HAVE_BOOST_TEST)
+
+boost_test_jamfile(FILE Jamfile LINK_LIBRARIES Boost::lambda2 Boost::core)
+
+endif()

test/Jamfile

@@ -2,18 +2,24 @@
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
+import-search /boost/config/checks ;
+
 import testing ;
-import ../../config/checks/config : requires ;
+import config : requires ;
 
 project : requirements
+  <library>/boost/lambda2//boost_lambda2
+  <library>/boost/config//boost_config
+  <library>/boost/core//boost_core
 
   <warnings>extra
 
   [ requires cxx14_return_type_deduction ]
 
   <toolset>msvc:<warnings-as-errors>on
   <toolset>clang:<warnings-as-errors>on
-  <toolset>gcc:<warnings-as-errors>on ;
+  <toolset>gcc:<warnings-as-errors>on
+;
 
 run quick.cpp ;
 run lambda2_test.cpp ;

test/cmake_install_test/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Copyright 2018, 2019 Peter Dimov
+# 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
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_install_test LANGUAGES CXX)
+
+find_package(boost_lambda2 REQUIRED)
+
+add_executable(quick ../quick.cpp)
+target_link_libraries(quick Boost::lambda2)
+
+enable_testing()
+add_test(quick quick)
+
+add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/cmake_subdir_test/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Copyright 2018, 2019 Peter Dimov
+# 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
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_subdir_test LANGUAGES CXX)
+
+add_subdirectory(../.. boostorg/lambda2)
+
+add_executable(quick ../quick.cpp)
+target_link_libraries(quick Boost::lambda2)
+
+enable_testing()
+add_test(quick quick)
+
+add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/quick.cpp

@@ -1,15 +1,11 @@
-// Copyright 2020 Peter Dimov
+// Copyright 2020, 2022 Peter Dimov
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/lambda2.hpp>
-#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
     using namespace boost::lambda2;
-
-    BOOST_TEST_EQ( (_1 + _2 * _3)( 1, 2, 3), 1 + 2 * 3 );
-
-    return boost::report_errors();
+    return (_1 + _2 * _3)( 1, 2, 3) == 1 + 2 * 3? 0: 1;
 }