Fix versioning regex (#128)

* Fix versioning regex

* Make versioning regex robust, fixes CI failures

The current solutions is hacky, since we want to keep using pure CMake
to extract this information. It should all be transferred to Python
and use Git to describe the number of commits that occurred since
a tag (as done in Psi4).

* Remove trailing dash in version with description

Author: robertodr

cmake/custom/pcmsolver.cmake

@@ -20,7 +20,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
 
 if(NOT DEFINED PYMOD_INSTALL_LIBDIR)
-  message(STATUS "Setting (unspecified) option ${variable}: ${default}")
+  message(STATUS "Setting (unspecified) option PYMOD_INSTALL_LIBDIR: python")
   set(PYMOD_INSTALL_LIBDIR "python" CACHE STRING "Location within CMAKE_INSTALL_LIBDIR to which Python modules are installed" FORCE)
 else()
   message(STATUS "Setting option PYMOD_INSTALL_LIBDIR: ${PYMOD_INSTALL_LIBDIR}")

cmake/custom/version.cmake

@@ -1,10 +1,15 @@
 file(READ ${PROJECT_SOURCE_DIR}/README.md _readme)
-#string(REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" _version_string ${_readme})
-string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" _version_string ${_readme})
-string(REPLACE "." ";" _version_list ${_version_string})
+string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[a-z,A-Z,0-9]+)?" PCMSolver_VERSION ${_readme})
+string(REPLACE "." ";" _version_list ${PCMSolver_VERSION})
 list(GET _version_list 0 PROJECT_VERSION_MAJOR)
 list(GET _version_list 1 PROJECT_VERSION_MINOR)
-list(GET _version_list 2 PROJECT_VERSION_PATCH)
+list(GET _version_list 2 _patch_describe)
+# Get PROJECT_VERSION_PATCH
+string(FIND ${_patch_describe} "-" _has_describe)
+if(_has_describe GREATER -1)
+  string(REGEX REPLACE "-[a-z,A-Z,0-9]+" "" PROJECT_VERSION_PATCH ${_patch_describe})
+else()
+  set(PROJECT_VERSION_PATCH ${_patch_describe})
+endif()
 
-set(${PROJECT_NAME}_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
-message(STATUS "${BoldGreen}PCMSolver v${${PROJECT_NAME}_VERSION}${ColourReset}")
+message(STATUS "${BoldGreen}PCMSolver v${PCMSolver_VERSION}${ColourReset}")

include/Config.hpp.in

@@ -28,8 +28,7 @@
 #define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
 #define PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH@
 
-#define PROJECT_VERSION                                                             \
-  @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@
+#define PROJECT_VERSION @PCMSolver_VERSION@
 #define PCMSOLVER_VERSION                                                           \
   ((PROJECT_VERSION_MAJOR << 16) | PROJECT_VERSION_MINOR | PROJECT_VERSION_PATCH)
 // clang-format on