Skip to content

Commit

Permalink
[MISC] Adapt name to sharg.
Browse files Browse the repository at this point in the history
  • Loading branch information
smehringer committed Nov 30, 2021
1 parent 19eca90 commit 3494d43
Show file tree
Hide file tree
Showing 7 changed files with 188 additions and 188 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci_linux.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: SARG CI on Linux
name: CI on Linux

on:
push:
Expand Down Expand Up @@ -42,10 +42,10 @@ jobs:
test_threads: 2

steps:
- name: Checkout SARG
- name: Checkout Sharg
uses: actions/checkout@v2
with:
path: sarg
path: sharg
fetch-depth: 3
submodules: recursive

Expand All @@ -56,7 +56,7 @@ jobs:
sudo apt-get update
- name: Install CMake
run: bash ./sarg/.github/workflows/scripts/install_cmake.sh
run: bash ./sharg/.github/workflows/scripts/install_cmake.sh

- name: Install ccache
run: sudo apt-get install --yes ccache
Expand Down Expand Up @@ -91,9 +91,9 @@ jobs:
CXX: ${{ matrix.cxx }}
CC: ${{ matrix.cc }}
run: |
mkdir sarg-build
cd sarg-build
cmake ../sarg/test/${{ matrix.build }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_FLAGS="${{ matrix.cxx_flags }}" -DSARG_VERBOSE_TESTS=OFF -DSARG_BENCHMARK_MIN_TIME=0.01
mkdir sharg-build
cd sharg-build
cmake ../sharg/test/${{ matrix.build }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_FLAGS="${{ matrix.cxx_flags }}" -DSHARG_VERBOSE_TESTS=OFF -DSHARG_BENCHMARK_MIN_TIME=0.01
make gtest_build
- name: Build tests
Expand All @@ -105,19 +105,19 @@ jobs:
CCACHE_MAXSIZE: 1G
run: |
ccache -p || true
cd sarg-build
cd sharg-build
make -k -j${{ matrix.build_threads }}
ccache -s || true
- name: Run tests
if: matrix.build != 'coverage'
run: |
cd sarg-build
cd sharg-build
ctest . -j${{ matrix.test_threads }} --output-on-failure
- name: Submit coverage build
if: matrix.build == 'coverage'
uses: codecov/codecov-action@v1
with:
files: ${{ github.workspace }}/sarg-build/sarg_coverage
root_dir: ${{ github.workspace }}/sarg
files: ${{ github.workspace }}/sharg-build/sharg_coverage
root_dir: ${{ github.workspace }}/sharg
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
# Copyright (c) 2006-2021, Knut Reinert & Freie Universität Berlin
# Copyright (c) 2016-2021, Knut Reinert & MPI für molekulare Genetik
# This file may be used, modified and/or redistributed under the terms of the 3-clause BSD-License
# shipped with this file and also available at: https://github.com/sargcpp/sarg/blob/master/LICENSE
# shipped with this file and also available at: https://github.com/shargcpp/sharg/blob/master/LICENSE
# -----------------------------------------------------------------------------------------------------

# This file adds version support for `find_package(SARG 3.1)`.
# This file adds version support for `find_package(SHARG 3.1)`.
# See https://cmake.org/cmake/help/v3.16/manual/cmake-packages.7.html#package-version-file for more information.
#
# This file was partially generated by
# https://cmake.org/cmake/help/v3.16/module/CMakePackageConfigHelpers.html#command:write_basic_package_version_file

# Note that sarg-config.cmake can be standalone and thus SARG_CLONE_DIR might be empty.
find_path (SARG_CLONE_DIR NAMES build_system/sarg-config.cmake HINTS "${CMAKE_CURRENT_LIST_DIR}/..")
find_path (SARG_INCLUDE_DIR NAMES sarg/version.hpp HINTS "${SARG_CLONE_DIR}/include")
# Note that sharg-config.cmake can be standalone and thus SHARG_CLONE_DIR might be empty.
find_path (SHARG_CLONE_DIR NAMES build_system/sharg-config.cmake HINTS "${CMAKE_CURRENT_LIST_DIR}/..")
find_path (SHARG_INCLUDE_DIR NAMES sharg/version.hpp HINTS "${SHARG_CLONE_DIR}/include")

# extract version from sarg/version.hpp header
file(STRINGS "${SARG_INCLUDE_DIR}/sarg/version.hpp" SARG_VERSION_HPP REGEX "#define SARG_VERSION_(MAJOR|MINOR|PATCH)")
string(REGEX REPLACE "#define SARG_VERSION_(MAJOR|MINOR|PATCH) " "" PACKAGE_VERSION "${SARG_VERSION_HPP}")
# extract version from sharg/version.hpp header
file(STRINGS "${SHARG_INCLUDE_DIR}/sharg/version.hpp" SHARG_VERSION_HPP REGEX "#define SHARG_VERSION_(MAJOR|MINOR|PATCH)")
string(REGEX REPLACE "#define SHARG_VERSION_(MAJOR|MINOR|PATCH) " "" PACKAGE_VERSION "${SHARG_VERSION_HPP}")
string(REGEX REPLACE ";" "." PACKAGE_VERSION "${PACKAGE_VERSION}")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
Expand Down
Loading

0 comments on commit 3494d43

Please sign in to comment.