Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ line_endings_support
neogb_io
msolve-*.tar.gz
msolve-*/
src/msolve/msolve-version.h
12 changes: 12 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,17 @@ AX_GCC_BUILTIN([__builtin_clzl])
# Checks for library functions.
AC_CHECK_FUNCS([floor getdelim gettimeofday memmove memset malloc realloc pow sqrt strchr strstr strtol])

# Configure version numbers
m4_define([version_split], m4_split(AC_PACKAGE_VERSION, [[.]]))
m4_define([version_major], m4_argn(1, version_split))
m4_define([version_minor], m4_argn(2, version_split))
m4_define([version_patch], m4_argn(3, version_split))

AC_SUBST([MSOLVE_VERSION_MAJOR],[version_major])
AC_SUBST([MSOLVE_VERSION_MINOR],[version_minor])
AC_SUBST([MSOLVE_VERSION_PATCH],[version_patch])


AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([
Makefile
Expand All @@ -86,6 +97,7 @@ AC_CONFIG_FILES([
src/neogb/Makefile
src/usolve/Makefile
src/msolve/Makefile
src/msolve/msolve-version.h
])
AC_CONFIG_LINKS([
input_files/line_endings/in1_dos.ms:input_files/line_endings/in1_dos.ms
Expand Down
3 changes: 2 additions & 1 deletion src/msolve/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
lib_LTLIBRARIES = libmsolve.la
libmsolve_la_SOURCES = libmsolve.c
libmsolve_ladir = $(includedir)/msolve/msolve
libmsolve_la_HEADERS = msolve-data.h msolve.h
libmsolve_la_HEADERS = msolve-data.h msolve-version.h msolve.h
libmsolve_la_CFLAGS = $(SIMD_FLAGS) $(CPUEXT_FLAGS) $(OPENMP_CFLAGS) -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare
libmsolve_la_LDFLAGS = -version-info $(LT_VERSION)
libmsolve_la_LIBADD = ../usolve/libusolve.la ../fglm/libfglm.la ../neogb/libneogb.la

EXTRA_DIST = msolve-data.h \
msolve-version.h \
msolve.h \
getdelim.h \
msolve-data.c \
Expand Down
30 changes: 30 additions & 0 deletions src/msolve/msolve-version.h.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/* This file is part of msolve.
*
* msolve is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* msolve is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with msolve. If not, see <https://www.gnu.org/licenses/>
*
* Authors:
* Jérémy Berthomieu
* Christian Eder
* Mohab Safey El Din */

#ifndef MSOLVE_VERSION_H
#define MSOLVE_VERSION_H

#define MSOLVE_VERSION_MAJOR @MSOLVE_VERSION_MAJOR@
#define MSOLVE_VERSION_MINOR @MSOLVE_VERSION_MINOR@
#define MSOLVE_VERSION_PATCHLEVEL @MSOLVE_VERSION_PATCH@
#define MSOLVE_VERSION_STR "@PACKAGE_VERSION@"
#define MSOLVE_VERSION_NUM (MSOLVE_VERSION_MAJOR * 10000 + MSOLVE_VERSION_MINOR * 100 + MSOLVE_VERSION_PATCHLEVEL)

#endif
1 change: 1 addition & 0 deletions src/msolve/msolve.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#define MSOLVE_MSOLVE_H

#include "msolve-data.h"
#include "msolve-version.h"

#ifdef __cplusplus
extern "C" {
Expand Down
Loading