From 9cbf3ac420c0b54996197198e900be338dbc3d05 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Wed, 21 Sep 2022 21:05:27 +0300 Subject: [PATCH] Fixed fclose_deleter test failing to build with CMake. Jamfile parser created incorrect test for fclose_deleter_test, which resulted in a compiler error. Prevent the parser from creating the test target by reformatting the Jamfile and create a CMake target with proper dependencies. --- test/CMakeLists.txt | 4 ++++ test/Jamfile.v2 | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7524ae6..21350f5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -27,6 +27,10 @@ set(BOOST_TEST_LINK_LIBRARIES Boost::core Boost::utility) boost_test(TYPE run SOURCES sv_conversion_test2.cpp) +set(BOOST_TEST_LINK_LIBRARIES Boost::core Boost::move Boost::smart_ptr) + +boost_test(TYPE run SOURCES fclose_deleter_test.cpp) + endif() add_subdirectory(swap) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index a08c937..5f356da 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -186,8 +186,7 @@ compile-fail scoped_enum_compile_fail_conv_to_int.cpp run underlying_type.cpp ; -run fclose_deleter_test.cpp - : : : windows:_CRT_SECURE_NO_WARNINGS windows:_CRT_SECURE_NO_DEPRECATE ; +run fclose_deleter_test.cpp : : : windows:_CRT_SECURE_NO_WARNINGS windows:_CRT_SECURE_NO_DEPRECATE ; run pointer_traits_pointer_test.cpp ; run pointer_traits_element_type_test.cpp ;