Add a trailing slash to db_path

epi2me-labs · Dec 19, 2022 · c29d46b · c29d46b
1 parent 2e069cc
commit c29d46b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [v0.0.10]
+### Fixed
+- Loading of database when user does not provide trailing `/`.
+
 ## [v0.0.9]
 ### Fixed
 - Segmentation fault in client when fasta/q comment sections are empty.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,12 +46,12 @@ endif()
 
 include(FindOpenMP)
 
-if(OPENMP_FOUND)
+if(OPENMP_FOUND AND NOT NO_OMP)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
-else(OPENMP_FOUND)
+else()
     message("ERROR: OpenMP could not be found.")
-endif(OPENMP_FOUND)
+endif()
 
 # Sources for file reading and messaging
 add_library(classify

diff --git a/server/kraken2_server.cc b/server/kraken2_server.cc
@@ -415,9 +415,9 @@ void ParseCommandLine(int argc, char **argv, Options &opts)
         case 'd':
         case 'D':
             opts.db_path = optarg;
-            opts.taxonomy_filename = optarg + std::string("taxo.k2d");
-            opts.options_filename = optarg + std::string("opts.k2d");
-            opts.index_filename = optarg + std::string("hash.k2d");
+            opts.taxonomy_filename = optarg + std::string("/taxo.k2d");
+            opts.options_filename = optarg + std::string("/opts.k2d");
+            opts.index_filename = optarg + std::string("/hash.k2d");
             break;
         case 'r':
         case 'R':