use tag info and git hash as version number

deepmodeling · Dec 12, 2023 · 4b87aca · 4b87aca
1 parent 2978f17
commit 4b87aca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/backend/openmm_dmff_plugin/python/CMakeLists.txt b/backend/openmm_dmff_plugin/python/CMakeLists.txt
@@ -22,6 +22,12 @@ execute_process(
     OUTPUT_VARIABLE GIT_HASH
     OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+execute_process(
+    COMMAND git describe --tags
+    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+    OUTPUT_VARIABLE GIT_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
 
 # Compile the Python module.
 add_custom_target(PythonInstall DEPENDS "${WRAP_FILE}")
@@ -36,4 +42,3 @@ add_custom_command(TARGET PythonInstall
     COMMAND "${PYTHON_EXECUTABLE}" setup.py install
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
-
diff --git a/backend/openmm_dmff_plugin/python/setup.py b/backend/openmm_dmff_plugin/python/setup.py
@@ -33,7 +33,7 @@
 
 
 setup(name='OpenMMDMFFPlugin',
-      version="@GIT_HASH@",
+      version="@GIT_VERSION@".lstrip('v').replace('-', ''),
       ext_modules=[extension],
       packages=['OpenMMDMFFPlugin', "OpenMMDMFFPlugin.tests"],
       package_data={"OpenMMDMFFPlugin":['data/lj_fluid/*.pb', 'data/lj_fluid/variables/variables.index', 'data/lj_fluid/variables/variables.data-00000-of-00001', 'data/lj_fluid_gpu/*.pb', 'data/lj_fluid_gpu/variables/variables.index', 'data/lj_fluid_gpu/variables/variables.data-00000-of-00001', 'data/*.pdb']},