fix versioning, update CMakeLists.txt and odgi

pangenome · Mar 6, 2023 · 0f350a3 · 0f350a3
1 parent e4c1149
commit 0f350a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -140,9 +140,6 @@ set(sparsepp_INCLUDE ${CMAKE_SOURCE_DIR}/deps/odgi/deps/sparsepp/sparsepp)
 set(flathashmap_INCLUDE ${CMAKE_SOURCE_DIR}/deps/odgi/deps/flat_hash_map)
 set(random_dist_INCLUDE ${CMAKE_SOURCE_DIR}/deps/odgi/deps/cpp_random_distributions)
 
-file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/deps/odgi/include)
-execute_process(COMMAND bash scripts/generate_git_version.sh include WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/deps/odgi)
-
 # mmmulti (memory mapped multimap)
 ExternalProject_Add(mmmulti
   SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/mmmulti"

diff --git a/deps/odgi b/deps/odgi
diff --git a/scripts/generate_git_version.sh b/scripts/generate_git_version.sh
@@ -1,5 +1,9 @@
 INC_DIR=$1
 
+# Go to the directory where the script is
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPT_DIR"
+
 GIT_VERSION=$(git describe --always --tags --long)
 
 echo "#define SMOOTHXG_GIT_VERSION" \"$GIT_VERSION\" > "$INC_DIR"/smoothxg_git_version.hpp
+1 −1		CMakeLists.txt
+5 −1		scripts/generate_git_version.sh
+149 −0		scripts/generate_release.sh