From 0f350a3cbd53dafbc6054c0d0cd9b76f2c22c2e6 Mon Sep 17 00:00:00 2001 From: AndreaGuarracino Date: Mon, 6 Mar 2023 16:18:10 -0600 Subject: [PATCH] fix versioning, update CMakeLists.txt and odgi --- CMakeLists.txt | 3 --- deps/odgi | 2 +- scripts/generate_git_version.sh | 4 ++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8dbe5d0..986063f8 100644 --- 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 index 19cea997..17647980 160000 --- a/deps/odgi +++ b/deps/odgi @@ -1 +1 @@ -Subproject commit 19cea997e29ea590c1ccd75c1d039b2b1ed44f74 +Subproject commit 176479802a8a4d570f8d403ff37c6548baefc12d diff --git a/scripts/generate_git_version.sh b/scripts/generate_git_version.sh index 535ed1e7..bbc45f4d 100644 --- 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