[INFRA] Update TDL

seqan · Feb 9, 2024 · 2e77d09 · 2e77d09
1 parent d48c51f
commit 2e77d09
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml
@@ -27,10 +27,15 @@ defaults:
 
 jobs:
   build:
-    name: "External project"
+    name: "External project ${{ contains(matrix.SHARG_NO_TDL, 'OFF') && 'with TDL' || 'without TDL' }}"
     runs-on: ubuntu-22.04
     timeout-minutes: 120
     if: github.repository_owner == 'seqan' || github.event_name == 'workflow_dispatch' || github.event.label.name == 'lint'
+    strategy:
+      fail-fast: false
+      matrix:
+        SHARG_NO_TDL: [ON, OFF]
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -48,13 +53,18 @@ jobs:
         uses: seqan/actions/setup-toolchain@main
         with:
           compiler: gcc-13
-          use_actions_cache: false
+
+      - name: Install dependencies
+        if: matrix.SHARG_NO_TDL == 'OFF'
+        run: |
+          FILENAME="libyaml-cpp-dev_0.8.0+dfsg-6_amd64.deb"
+          wget http://http.us.debian.org/debian/pool/main/y/yaml-cpp/${FILENAME} && sudo dpkg -i ${FILENAME}
 
       - name: Configure tests
         run: |
           mkdir sharg-build
           cd sharg-build
-          cmake ../sharg-parser/test/external_project -DCMAKE_BUILD_TYPE=Debug
+          cmake ../sharg-parser/test/external_project -DCMAKE_BUILD_TYPE=Debug -DSHARG_NO_TDL=${{ matrix.SHARG_NO_TDL }}
           make -j2 sharg_test_prerequisite
 
       - name: Build tests

diff --git a/build_system/sharg-config.cmake b/build_system/sharg-config.cmake
@@ -206,7 +206,19 @@ endif ()
 set (SHARG_USE_TDL FALSE)
 
 if (NOT SHARG_NO_TDL)
-    find_package (TDL QUIET HINTS ${SHARG_SUBMODULES_DIR}/submodules/tool_description_lib ${SHARG_HINT_TDL})
+    find_package (TDL QUIET HINTS ${SHARG_HINT_TDL})
+
+    if (NOT TDL_FOUND)
+        if (EXISTS ${SHARG_SUBMODULES_DIR}/submodules/tool_description_lib)
+            include (FetchContent)
+            FetchContent_Declare (tdl SOURCE_DIR ${SHARG_SUBMODULES_DIR}/submodules/tool_description_lib)
+            set (SHARG_LOG_LEVEL ${CMAKE_MESSAGE_LOG_LEVEL})
+            set (CMAKE_MESSAGE_LOG_LEVEL "ERROR")
+            FetchContent_MakeAvailable (tdl)
+            set (CMAKE_MESSAGE_LOG_LEVEL ${SHARG_LOG_LEVEL})
+            set (TDL_FOUND TRUE)
+        endif ()
+    endif ()
 
     if (TDL_FOUND)
         sharg_config_print ("Optional dependency:        TDL found.")

diff --git a/submodules/tool_description_lib b/submodules/tool_description_lib
diff --git a/test/snippet/CMakeLists.txt b/test/snippet/CMakeLists.txt
@@ -48,7 +48,6 @@ endmacro ()
 macro (sharg_snippets test_name_prefix snippet_base_path_)
     get_filename_component (snippet_base_path "${snippet_base_path_}" ABSOLUTE BASE_DIR
                             "${CMAKE_CURRENT_SOURCE_DIR}/../..")
-    message (STATUS "${snippet_base_path}")
     sharg_test_files (snippet_files "${snippet_base_path}" "*.cpp")
     foreach (snippet ${snippet_files})
         sharg_snippet ("${test_name_prefix}" "${snippet}" "${snippet_base_path}")
+42 −4		.github/workflows/ci_cmake.yml
+2 −1		.github/workflows/ci_license_check.yml
+1 −0		.github/workflows/ci_macos.yml
+63 −0		.github/workflows/ci_mingw.yml
+2 −1		.github/workflows/ci_ubuntu2004.yml
+2 −1		.github/workflows/ci_ubuntu2204.yml
+13 −10		.github/workflows/ci_win.yml
+41 −0		.github/workflows/update_example.yml
+2 −2		CMakeLists.txt
+11 −7		Example00.cpp.md
+4 −5		Example01.cpp.md
+9 −0		LICENSES/MIT.txt
+24 −0		cmake/CPM.cmake
+38 −0		cmake/configuration.cmake
+16 −4		cmake/install.cmake
+10 −0		cmake/tdl-config.cmake.in
+2 −2		src/tdl/convertToCTD.h
+29 −26		src/tdl/convertToCWL.h
+13 −11		src/tdl/cwl_v1_2.h
+0 −0		src/test_tdl/ToolInfoToCTD_test.cpp
+95 −78		src/test_tdl/ToolInfoToCWL_test.cpp
+14 −0		src/test_tdl/example/CMakeLists.txt
+57 −0		src/test_tdl/example/example1.cpp
+0 −51		tdl-config.cmake