💚 Try to repair damage from CI

soasis · Oct 7, 2022 · fd6f59a · fd6f59a
1 parent c29ea68
commit fd6f59a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -119,6 +119,7 @@ option(ZTD_TEXT_DOCUMENTATION_NO_SPHINX "Turn off Sphinx usage (useful for ReadT
 option(ZTD_TEXT_EXAMPLES "Enable build of examples" OFF)
 option(ZTD_TEXT_BENCHMARKS "Enable build of benchmarks" OFF)
 option(ZTD_TEXT_GENERATE_SINGLE "Enable generation of a single header and its target" OFF)
+option(ZTD_TEXT_BOOST.TEXT "Enable usage of Boost.Text benchmarks and examples" OFF)
 
 # # Dependencies
 # ztd.idk
@@ -224,7 +225,9 @@ if (ZTD_TEXT_EXAMPLES OR ZTD_TEXT_BENCHMARKS)
 			GIT_TAG        master)
 		FetchContent_MakeAvailable(boost.text)
 	endfunction()
-	boost_text_dependency_jail()
+	if (ZTD_TEXT_BOOST.TEXT)
+		boost_text_dependency_jail()
+	endif()
 endif()
 
 if(ZTD_TEXT_TESTS)

diff --git a/benchmarks/conversion_speed/CMakeLists.txt b/benchmarks/conversion_speed/CMakeLists.txt
@@ -34,6 +34,10 @@ file(GLOB_RECURSE ztd.text.benchmarks.conversion_speed.sources
 	LIST_DIRECTORIES NO
 	source/**)
 
+if (NOT ZTD_TEXT_BOOST.TEXT)
+	list(FILTER ztd.text.benchmarks.conversion_speed.sources EXCLUDE REGEX boost.text)
+endif()
+
 add_executable(ztd.text.benchmarks.conversion_speed ${ztd.text.benchmarks.conversion_speed.sources})
 target_include_directories(ztd.text.benchmarks.conversion_speed
 	PRIVATE
@@ -49,7 +53,7 @@ target_link_libraries(ztd.text.benchmarks.conversion_speed
 		ztd::text
 		ctre::ctre
 		utf8::cpp
-		Boost::text
+		$<$<BOOL:${ZTD_TEXT_BOOST.TEXT}>:Boost::text>
 		benchmark::benchmark
 		${CMAKE_DL_LIBS}
 )

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -30,5 +30,7 @@
 
 add_subdirectory(basic)
 add_subdirectory(documentation)
-add_subdirectory(boost.text)
+if (ZTD_TEXT_BOOST.TEXT)
+	add_subdirectory(boost.text)
+endif()
 add_subdirectory(shift_jis)
diff --git a/include/ztd/text/impl/execution_cuchar.hpp b/include/ztd/text/impl/execution_cuchar.hpp
@@ -352,7 +352,7 @@ namespace ztd { namespace text {
 
 				code_point __codepoint = *__in_it;
 				ranges::advance(__in_it);
-				code_unit __intermediary_output[MB_LEN_MAX] {};
+				code_unit __intermediary_output[(MB_LEN_MAX * 2)] {};
 				::std::size_t __res = ZTD_UCHAR_ACCESSOR_I_ c32rtomb(
 					__intermediary_output, __codepoint, ::std::addressof(__s.__narrow_state));
 				if constexpr (__call_error_handler) {