Skip to content

Commit

Permalink
Merge branch 'master' into dev/vcf4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
tcezard authored Oct 11, 2024
2 parents 6bd439d + 1edca3e commit 6ed9dc3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ jobs:
- name: Compile and test
run: |
mkdir build && cd build && cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} ..
export LIBRARY_PATH=${LIBRARY_PATH}:/opt/homebrew/opt/icu4c/lib:/opt/homebrew/lib
make -j2
cd .. && ./build/bin/test_validation_suite
- name: Rename release files
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ if (LINUX)
elseif (OSX)
# Mac build not fully static. include system libraries to be dynamic
set (CMAKE_EXE_LINKER_FLAGS)
set (Boost_USE_STATIC_LIBS ON) # only find static libs
set (Boost_USE_STATIC_LIBS OFF) # use dynamically linked libraries
elseif (WINDOWS)
set (Boost_USE_STATIC_LIBS ON) # only find static libs
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") # also requires boost with runtime-link=static
Expand Down
2 changes: 2 additions & 0 deletions inc/vcf/validator_detail_v41.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,9 @@ case 1:
#line 264 "src/vcf/vcf.ragel"
{
ErrorPolicy::handle_error(*this, new MetaSectionError{n_lines,

"ALT metadata ID is not prefixed by DEL/INS/DUP/INV/CNV" + (source->version < Version::v44 ? std::string("/BND") : std::string("")) + " and suffixed by ':' and a text sequence"});

p--; {goto st533;}
}
#line 259 "src/vcf/vcf.ragel"
Expand Down
1 change: 1 addition & 0 deletions inc/vcf/validator_detail_v42.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ case 1:
{
ErrorPolicy::handle_error(*this, new MetaSectionError{n_lines,
"ALT metadata ID is not prefixed by DEL/INS/DUP/INV/CNV" + (source->version < Version::v44 ? std::string("/BND") : std::string("")) + " and suffixed by ':' and a text sequence"});

p--; {goto st605;}
}
#line 259 "src/vcf/vcf.ragel"
Expand Down

0 comments on commit 6ed9dc3

Please sign in to comment.