From 92c94a878cb67a55728c11d5c8b2f91eee8f7522 Mon Sep 17 00:00:00 2001 From: cheater Date: Mon, 27 May 2024 22:30:18 +0300 Subject: [PATCH 1/3] alias --- thirdparty/external_boost_deps.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/thirdparty/external_boost_deps.cmake b/thirdparty/external_boost_deps.cmake index 8b3d355..08c16f8 100644 --- a/thirdparty/external_boost_deps.cmake +++ b/thirdparty/external_boost_deps.cmake @@ -33,13 +33,13 @@ if (boost_algorithm_FOUND AND boost_json_FOUND AND boost_optional_FOUND AND boost_variant_FOUND AND boost_regex_FOUND) - imported_target_alias(boost_algorithm ALIAS boost_algorithm::boost_algorithm) - imported_target_alias(boost_filesystem ALIAS boost_filesystem::boost_filesystem) - imported_target_alias(boost_numeric_conversion ALIAS numeric_conversion::numeric_conversion) - imported_target_alias(boost_json ALIAS boost_json::boost_json) - imported_target_alias(boost_optional ALIAS boost_optional::boost_optional) - imported_target_alias(boost_variant ALIAS boost_variant::boost_variant) - imported_target_alias(boost_regex ALIAS boost_regex::boost_regex) + imported_target_alias(boost_algorithm ALIAS boost_algorithm) + imported_target_alias(boost_filesystem ALIAS boost_filesystem) + imported_target_alias(boost_numeric_conversion ALIAS numeric_conversion) + imported_target_alias(boost_json ALIAS boost_json) + imported_target_alias(boost_optional ALIAS boost_optional) + imported_target_alias(boost_variant ALIAS boost_variant) + imported_target_alias(boost_regex ALIAS boost_regex) else () find_package(Boost COMPONENTS system filesystem numeric_conversion json regex ${FIND_BOOST_PACKAGE_QUIET} REQUIRED) From 507f52d8e29d7cc99eaa8130bf9e9c6ed8d9f370 Mon Sep 17 00:00:00 2001 From: cheater Date: Sat, 8 Jun 2024 19:50:11 +0300 Subject: [PATCH 2/3] fix boost deps --- thirdparty/external_boost_deps.cmake | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/thirdparty/external_boost_deps.cmake b/thirdparty/external_boost_deps.cmake index 08c16f8..171d9dc 100644 --- a/thirdparty/external_boost_deps.cmake +++ b/thirdparty/external_boost_deps.cmake @@ -26,6 +26,7 @@ find_package(boost_json ${FIND_BOOST_PACKAGE_QUIET}) find_package(boost_optional ${FIND_BOOST_PACKAGE_QUIET}) find_package(boost_variant ${FIND_BOOST_PACKAGE_QUIET}) find_package(boost_regex ${FIND_BOOST_PACKAGE_QUIET}) +find_package(boost_lexical_cast ${FIND_BOOST_PACKAGE_QUIET}) if (boost_algorithm_FOUND AND boost_filesystem_FOUND AND @@ -33,15 +34,17 @@ if (boost_algorithm_FOUND AND boost_json_FOUND AND boost_optional_FOUND AND boost_variant_FOUND AND boost_regex_FOUND) - imported_target_alias(boost_algorithm ALIAS boost_algorithm) - imported_target_alias(boost_filesystem ALIAS boost_filesystem) - imported_target_alias(boost_numeric_conversion ALIAS numeric_conversion) - imported_target_alias(boost_json ALIAS boost_json) - imported_target_alias(boost_optional ALIAS boost_optional) - imported_target_alias(boost_variant ALIAS boost_variant) - imported_target_alias(boost_regex ALIAS boost_regex) + imported_target_alias(boost_algorithm ALIAS boost_algorithm::boost_algorithm) + imported_target_alias(boost_filesystem ALIAS boost_filesystem::boost_filesystem) + imported_target_alias(boost_numeric_conversion ALIAS numeric_conversion::numeric_conversion) + imported_target_alias(boost_json ALIAS boost_json::boost_json) + imported_target_alias(boost_optional ALIAS boost_optional::boost_optional) + imported_target_alias(boost_variant ALIAS boost_variant::boost_variant) + imported_target_alias(boost_regex ALIAS boost_regex::boost_regex) + imported_target_alias(boost_lexical_cast ALIAS boost_regex::lexical_cast) + else () - find_package(Boost COMPONENTS system filesystem numeric_conversion json regex ${FIND_BOOST_PACKAGE_QUIET} REQUIRED) + find_package(Boost COMPONENTS system filesystem numeric_conversion json regex optional variant algorithm lexical_cast ${FIND_BOOST_PACKAGE_QUIET} REQUIRED) if (Boost_FOUND) imported_target_alias(boost_algorithm ALIAS Boost::boost) @@ -51,6 +54,7 @@ else () imported_target_alias(boost_optional ALIAS Boost::boost) imported_target_alias(boost_variant ALIAS Boost::boost) imported_target_alias(boost_regex ALIAS Boost::regex) + imported_target_alias(boost_lexical_cast ALIAS boost_regex::lexical_cast) endif () endif () From 2e601a9f3c895def243d428e956cbecc94c56a9c Mon Sep 17 00:00:00 2001 From: cheater Date: Sat, 8 Jun 2024 19:55:45 +0300 Subject: [PATCH 3/3] typo fix --- thirdparty/external_boost_deps.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/external_boost_deps.cmake b/thirdparty/external_boost_deps.cmake index 171d9dc..e6305d2 100644 --- a/thirdparty/external_boost_deps.cmake +++ b/thirdparty/external_boost_deps.cmake @@ -54,7 +54,7 @@ else () imported_target_alias(boost_optional ALIAS Boost::boost) imported_target_alias(boost_variant ALIAS Boost::boost) imported_target_alias(boost_regex ALIAS Boost::regex) - imported_target_alias(boost_lexical_cast ALIAS boost_regex::lexical_cast) + imported_target_alias(boost_lexical_cast ALIAS Boost::lexical_cast) endif () endif ()