Extend and improve version support

Requires SWIG a9a2d6a239319757a599862319952e5cef767b6f

Author: sethrj

.gitattributes

@@ -0,0 +1,2 @@
+/.* export-ignore
+/cmake/git-version.txt export-subst

CMakeLists.txt

@@ -60,9 +60,38 @@ else()
 endif()
 
 #---------------------------------------------------------------------------#
-# GIT
+# VERSIONING
 #---------------------------------------------------------------------------#
 
+
+# Get a possible Git version generated using git-archive (see the .gitattributes
+# file)
+file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/git-version.txt"
+     FLIBCPP_VERSION_STRING)
+
+if (NOT FLIBCPP_VERSION_STRING MATCHES "\\$Format:")
+  # First line are decorators, second is hash
+  list(GET FLIBCPP_VERSION_STRING 0 _tag)
+  string(REGEX REPLACE ".*, *(tag: *)?" "" _tag "${_tag}")
+  list(GET FLIBCPP_VERSION_STRING 1 _hash)
+  string(REGEX REPLACE " +" "" _hash "${_hash}")
+  set(FLIBCPP_VERSION_STRING "${_tag}-g${_hash}")
+else()
+  find_package(Git)
+  if (Git_FOUND)
+    execute_process(
+      COMMAND "${GIT_EXECUTABLE}" "describe"
+      ERROR_QUIET
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+      OUTPUT_VARIABLE FLIBCPP_VERSION_STRING
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+  else()
+    set(FLIBCPP_VERSION_STRING "${Flibcpp_VERSION}")
+  endif()
+endif()
+
+
 set(FLIBCPP_VERSION_CPP "${CMAKE_CURRENT_BINARY_DIR}/flibcpp_version.cpp")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/flibcpp_version.cpp.in"
   "${FLIBCPP_VERSION_CPP}" @ONLY)
@@ -88,8 +117,6 @@ function(swig_fortran_add_module name)
   set_property(SOURCE src/${name}.i
     PROPERTY USE_TARGET_INCLUDE_DIRECTORIES ON)
 
-  message(STATUS "Extra sources for ${name}: ${ARGN}")
-
   if (FLIBCPP_USE_SWIG)
     # SWIG is available; actually generate the library dynamically.
     # Create the library
@@ -158,7 +185,6 @@ install(EXPORT Flibcpp-targets
 # Create a ConfigVersion.cmake file
 include(CMakePackageConfigHelpers)
 
-message(STATUS "Libraries: ${FLIBCPP_LIBRARIES}")
 configure_package_config_file(
   ${CMAKE_CURRENT_LIST_DIR}/cmake/FlibcppConfig.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/FlibcppConfig.cmake

cmake/flibcpp_version.cpp.in

@@ -1 +1,4 @@
-extern "C" const char flibcpp_version_string[] = "@Flibcpp_VERSION@";
+extern "C" const char flibcpp_version[] = "@FLIBCPP_VERSION_STRING@";
+extern "C" const int flibcpp_version_major = @PROJECT_VERSION_MAJOR@;
+extern "C" const int flibcpp_version_minor = @PROJECT_VERSION_MINOR@;
+extern "C" const int flibcpp_version_patch = @PROJECT_VERSION_PATCH@;

cmake/git-version.txt

@@ -0,0 +1,2 @@
+$Format:%D$
+$Format:%h$ 

example/sort.f90

@@ -5,14 +5,16 @@
 program main
     use ISO_FORTRAN_ENV
     use, intrinsic :: ISO_C_BINDING
-    use flc, only : get_flibcpp_version_string
+    use flc
     use flc_algorithm, only : sort
 
     implicit none
     integer :: n = 10000
     real(c_double), dimension(:), allocatable :: x
 
-    write(*,*) "Flibcpp version ", get_flibcpp_version_string()
+    write(*,"(a, 2(i1,'.'), (i1))") "Flibcpp version number: ", &
+        flibcpp_version_major, flibcpp_version_minor, flibcpp_version_patch
+    write(*,*) "Flibcpp version string: ", get_flibcpp_version()
 
     allocate(x(n))
     ! TODO: fill randomly

src/flc.i

@@ -62,10 +62,16 @@ using std::size_t;
  * Linked into auto-generated file flibcpp_version.cpp
  ************************/
 
-%apply const char* { const char flibcpp_version_string[] };
+%apply const char* { const char flibcpp_version[] };
+%fortranbindc flibcpp_version_major;
+%fortranbindc flibcpp_version_minor;
+%fortranbindc flibcpp_version_patch;
 
 %inline %{
 extern "C" {
-extern const char flibcpp_version_string[];
+extern const char flibcpp_version[];
+extern const int flibcpp_version_major;
+extern const int flibcpp_version_minor;
+extern const int flibcpp_version_patch;
 }
 %}

src/generated/flc.f90

@@ -18,12 +18,18 @@ module flc
   type(C_PTR), public :: data = C_NULL_PTR
   integer(C_SIZE_T), public :: size = 0
  end type
- public :: get_flibcpp_version_string
+ public :: get_flibcpp_version
+ integer(C_INT), protected, public, &
+   bind(C, name="flibcpp_version_major") :: flibcpp_version_major
+ integer(C_INT), protected, public, &
+   bind(C, name="flibcpp_version_minor") :: flibcpp_version_minor
+ integer(C_INT), protected, public, &
+   bind(C, name="flibcpp_version_patch") :: flibcpp_version_patch
 
 ! WRAPPER DECLARATIONS
 interface
-function swigc_flibcpp_version_string_get() &
-bind(C, name="_wrap_flibcpp_version_string_get") &
+function swigc_flibcpp_version_get() &
+bind(C, name="_wrap_flibcpp_version_get") &
 result(fresult)
 use, intrinsic :: ISO_C_BINDING
 import :: swigarraywrapper
@@ -54,13 +60,13 @@ subroutine SWIG_chararray_to_string(wrap, string)
   end do
 end subroutine
 
-function get_flibcpp_version_string() &
+function get_flibcpp_version() &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
 character(kind=C_CHAR, len=:), allocatable :: swig_result
 type(SwigArrayWrapper) :: fresult 
 
-fresult = swigc_flibcpp_version_string_get()
+fresult = swigc_flibcpp_version_get()
 call SWIG_chararray_to_string(fresult, swig_result)
 if (.false.) call SWIG_free(fresult%data)
 end function

src/generated/flcFORTRAN_wrap.cxx

@@ -223,7 +223,10 @@ using std::size_t;
 
 
 extern "C" {
-extern const char flibcpp_version_string[];
+extern const char flibcpp_version[];
+extern const int flibcpp_version_major;
+extern const int flibcpp_version_minor;
+extern const int flibcpp_version_patch;
 }
 
 
@@ -255,11 +258,11 @@ SWIGINTERN SwigArrayWrapper SwigArrayWrapper_uninitialized() {
 #include <string.h>
 
 extern "C" {
-SWIGEXPORT SwigArrayWrapper _wrap_flibcpp_version_string_get() {
+SWIGEXPORT SwigArrayWrapper _wrap_flibcpp_version_get() {
   SwigArrayWrapper fresult ;
   char *result = 0 ;
 
-  result = (char *)(char *)flibcpp_version_string;
+  result = (char *)(char *)flibcpp_version;
   fresult.size = strlen(reinterpret_cast< const char* >(result));
   fresult.data = const_cast< char * >(result);
   return fresult;