Skip to content

Commit 7096fab

Browse files
jaebeom-kimjaebeom-kim
authored
Merge branch 'master' into master
2 parents eff8c77 + 74151d4 commit 7096fab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+6116
-1573
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,11 @@
3030
*.exe
3131
*.out
3232
*.app
33+
34+
# Files
35+
*.gz
36+
*.tsv
37+
*.dmp
38+
# Build directories
39+
build*
40+

‎CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
22
# keep old policy for setting implicit link libraries
33
# zlib causes issues in static builds otherwise
4-
project(metabuli CXX)
5-
set(CMAKE_CXX_STANDARD 14)
4+
# cmake_policy(SET CMP0060 OLD)
5+
project(metabuli CXX C)
6+
set(CMAKE_CXX_STANDARD 17)
7+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
68
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
79
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/lib/mmseqs/cmake")
810

@@ -16,6 +18,7 @@ add_subdirectory(lib/mmseqs)
1618
add_subdirectory(lib/prodigal)
1719
add_subdirectory(lib/fasta_validator)
1820
add_subdirectory(lib/fastq_utils)
21+
add_subdirectory(lib/yxml)
1922
add_subdirectory(src)
2023
add_subdirectory(data)
2124
include_directories(lib)

‎lib/yxml/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
add_library(yxml
2+
yxml.h
3+
yxml.c
4+
)
5+
6+
set_target_properties(yxml PROPERTIES COMPILE_FLAGS "${MMSEQS_CXX_FLAGS} -w" LINK_FLAGS "${MMSEQS_CXX_FLAGS} -w")

0 commit comments

Comments
 (0)