|
19 | 19 |
|
20 | 20 | # Library names |
21 | 21 | G_BOOST_LIB_NAME: "Boost" |
| 22 | + G_CATCH2_LIB_NAME: "Catch2" |
22 | 23 | G_FMT_LIB_NAME: "fmt" |
23 | 24 | G_GSL_LIB_NAME: "Microsoft.GSL" |
24 | 25 |
|
@@ -221,7 +222,7 @@ tasks: |
221 | 222 | - "-DCMAKE_CXX_STANDARD=20" |
222 | 223 | - "-DCMAKE_CXX_STANDARD_REQUIRED=ON" |
223 | 224 | - "-DCMAKE_INSTALL_MESSAGE=LAZY" |
224 | | - LIB_NAME: "Catch2" |
| 225 | + LIB_NAME: "{{.G_CATCH2_LIB_NAME}}" |
225 | 226 | TARBALL_SHA256: "1ab2de20460d4641553addfdfe6acd4109d871d5531f8f519a52ea4926303087" |
226 | 227 | TARBALL_URL: "https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz" |
227 | 228 |
|
@@ -512,23 +513,20 @@ tasks: |
512 | 513 |
|
513 | 514 | ystdlib: |
514 | 515 | internal: true |
515 | | - vars: |
516 | | - LIB_NAME: "ystdlib" |
517 | | - YSTDLIB_OUTPUT_DIR: "{{.G_DEPS_CORE_DIR}}/{{.LIB_NAME}}-src" |
518 | 516 | run: "once" |
519 | 517 | deps: |
520 | | - - task: "utils:init" |
| 518 | + - task: "boost" |
| 519 | + - task: "catch2" |
521 | 520 | cmds: |
522 | | - - task: "yscope-dev-utils:remote:download-and-extract-tar" |
| 521 | + - task: "utils:install-remote-cmake-lib" |
523 | 522 | vars: |
524 | | - CHECKSUM_FILE: "{{.G_DEPS_CORE_CHECKSUMS_DIR}}/{{.LIB_NAME}}.md5" |
525 | | - FILE_SHA256: "65990dc2bcc4a355c2181bfe31a7800f492309d1bcd340f52a34e85047e61bc8" |
526 | | - OUTPUT_DIR: "{{.YSTDLIB_OUTPUT_DIR}}" |
527 | | - URL: "https://github.com/y-scope/ystdlib-cpp/archive/9ed78cd.tar.gz" |
528 | | - - >- |
529 | | - echo "set( |
530 | | - CLP_YSTDLIB_SOURCE_DIRECTORY \"{{.YSTDLIB_OUTPUT_DIR}}\" |
531 | | - )" > "{{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}/{{.LIB_NAME}}.cmake" |
| 523 | + CMAKE_GEN_ARGS: |
| 524 | + - "-C {{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}/{{.G_BOOST_LIB_NAME}}.cmake" |
| 525 | + - "-C {{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}/{{.G_CATCH2_LIB_NAME}}.cmake" |
| 526 | + - "-Dystdlib_BUILD_TESTING=OFF" |
| 527 | + LIB_NAME: "ystdlib" |
| 528 | + TARBALL_SHA256: "65990dc2bcc4a355c2181bfe31a7800f492309d1bcd340f52a34e85047e61bc8" |
| 529 | + TARBALL_URL: "https://github.com/y-scope/ystdlib-cpp/archive/9ed78cd.tar.gz" |
532 | 530 |
|
533 | 531 | zlib: |
534 | 532 | internal: true |
|
0 commit comments