From 89c14a85c9c066b3577153b39ab7dee2066f6d93 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 27 Nov 2024 13:49:45 -0500 Subject: [PATCH 1/4] build(cli11): bump to 2024-11-27 main --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d199a901c..824e52c63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ FetchContent_Declare( set(CLI11_GIT_REPOSITORY "https://github.com/CLIUtils/CLI11") # v2.4.2 -set(CLI11_GIT_TAG "6c7b07a878ad834957b98d0f9ce1dbe0cb204fc9") +set(CLI11_GIT_TAG "3306c444f293f739f0c48afaafdb110a1e2a507b") FetchContent_Declare( cli11 GIT_REPOSITORY ${CLI11_GIT_REPOSITORY} From 97ce61edb2c7bf302480181e4ba4eab1ea4d4f61 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 28 Nov 2024 16:15:32 -0500 Subject: [PATCH 2/4] build(cli11): bump to 2024-11-28 main --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 824e52c63..4b19f85e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,8 @@ FetchContent_Declare( ) set(CLI11_GIT_REPOSITORY "https://github.com/CLIUtils/CLI11") -# v2.4.2 -set(CLI11_GIT_TAG "3306c444f293f739f0c48afaafdb110a1e2a507b") +# v2.4.2+, 2024-11-28 main +set(CLI11_GIT_TAG "8260578fd276c8ed6aa46f0fbc946b7685dd2c36") FetchContent_Declare( cli11 GIT_REPOSITORY ${CLI11_GIT_REPOSITORY} From 02bda63ecc5581c45ef7d227e7eff86059a8708c Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 29 Nov 2024 07:46:22 -0500 Subject: [PATCH 3/4] fix(itkPipeline): return CLI::CallForHelp with -h, --help This is intended for the two flags as opposed to --help-all. Also work around: Error: failed to run main module `wasi-build/mean-squares-versor-registration.wasi.wasm` Caused by: 0: failed to invoke command default 1: error while executing at wasm backtrace: 0: 0x56479 - mean-squares-versor-registration.wasi.wasm!abort 1: 0x6834d - __cxa_allocate_exception at /ITKWebAssemblyInterface/src/exceptionShim.cxx:28:3 2: 0x680c8 - std::__2::__throw_out_of_range[abi:ne180100](char const*) at /usr/wasi-sdk-22.0/share/wasi-sysroot/include/wasm32-wasi/c++/v1/stdexcept:249:3 3: 0x6801a - std::__2::basic_string, std::__2::allocator >::__throw_out_of_range[abi:ne180100]() const at /usr/wasi-sdk-22.0/share/wasi-sysroot/include/wasm32-wasi/c++/v1/string:2117:5 4: 0x764de - mean-squares-versor-registration.wasi.wasm!itk::wasm::Pipeline::exit(CLI::Error const&) 5: 0x7151d - __main_argc_argv at /work/mean-squares-versor-registration.cxx:159:3 6: 0x616f9 - mean-squares-versor-registration.wasi.wasm!__main_void 7: 0x29bec0 - itk_wasm_delayed_start at /ITKWebAssemblyInterface/src/initialization.cxx:81:17 8: 0x29befb - _start at /ITKWebAssemblyInterface/src/initialization.cxx:92:26 --- include/itkPipeline.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/itkPipeline.h b/include/itkPipeline.h index 6b06a69f0..51499938f 100644 --- a/include/itkPipeline.h +++ b/include/itkPipeline.h @@ -42,7 +42,8 @@ const std::string arg(iwpArgv[ii]); \ if (arg == "-h" || arg == "--help") \ { \ - (pipeline).exit(CLI::CallForAllHelp()); \ + const auto parseResult = CLI::CallForHelp(); \ + (pipeline).exit(parseResult); \ std::exit(0); \ } \ if (arg == "--interface-json") \ From 4f0b94aa2189fe938ca3ae7bc4bd21a02c9d5d53 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 3 Dec 2024 08:15:21 -0500 Subject: [PATCH 4/4] build(cli11): do not use shallow clones Work around missing commit errors. --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b19f85e2..eaf193406 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,6 @@ FetchContent_Declare( cli11 GIT_REPOSITORY ${CLI11_GIT_REPOSITORY} GIT_TAG ${CLI11_GIT_TAG} - GIT_SHALLOW TRUE ) set(rang_GIT_REPOSITORY "https://github.com/agauniyal/rang.git")