From 1ae59530f807cc5d74875a9e56315f128b12a573 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Thu, 11 Dec 2025 23:57:49 -0500 Subject: [PATCH 1/4] Add cmake files to tarball --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f0bc067..9140363 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,7 +50,8 @@ pkgconfig_DATA = build/autotools/mathic.pc # When making a distribution file, Automake knows to include all files # that are necessary to build the project. EXTRA_DIST specifies files # to include beyond those used in the build process. -EXTRA_DIST = autogen.sh +EXTRA_DIST = autogen.sh CMakeLists.txt src/CMakeLists.txt \ + cmake/FindMemtailor.cmake # tell automake what programs are there that are not built automatically EXTRA_PROGRAMS = pqsim divsim From e2a206752be1909f2c092710d7bb6f26c4334775 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Fri, 12 Dec 2025 00:01:18 -0500 Subject: [PATCH 2/4] Also test cmake build in GitHub workflow --- .github/workflows/build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f8aa06f..1d5df6e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,13 +12,17 @@ jobs: - name: Install dependencies run: | sudo apt-get install -y libgtest-dev libmemtailor-dev - - name: Build mathic + - name: Build mathic (autotools) run: | ./autogen.sh cd build/autotools ../../configure make - - name: Check mathic - run: | - cd build/autotools + make check make distcheck + - name: Build mathic (cmake) + run: | + mkdir -p build/cmake + cd build/cmake + cmake -B. -S../.. -GNinja + ninja From ded7dbb869edbd32e47bfe9eeedafcd5f80f1153 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Fri, 12 Dec 2025 00:05:26 -0500 Subject: [PATCH 3/4] Use PACKAGE_VERSION to get version string --- configure.ac | 2 +- src/mathic.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 68477c8..e21d8d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Note: also update version in CMakeLists.txt and src/mathic.cpp +# Note: also update version in CMakeLists.txt dnl AC_INIT sets up autoconf and must be first macro. AC_INIT([mathic], [1.0]) # package, version, bug-report-email diff --git a/src/mathic.cpp b/src/mathic.cpp index f674676..7ac3292 100644 --- a/src/mathic.cpp +++ b/src/mathic.cpp @@ -2,5 +2,5 @@ extern "C" { void libmathicIsPresent(void) {} - char MATHIC_VERSION_STRING[] = "1.0"; + char MATHIC_VERSION_STRING[] = PACKAGE_VERSION; } From f61435f61d7f64b3941b8b8f3168ed1e0ca346f1 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Fri, 12 Dec 2025 07:29:20 -0500 Subject: [PATCH 4/4] Bump to version 1.1 --- CMakeLists.txt | 2 +- configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bc0787..79b0dad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) -project(mathic VERSION 1.0 LANGUAGES CXX) +project(mathic VERSION 1.1 LANGUAGES CXX) option(enable_pqsim "Build pqsim" OFF) option(enable_divsim "Build divsim" OFF) diff --git a/configure.ac b/configure.ac index e21d8d3..e7cad5e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Note: also update version in CMakeLists.txt dnl AC_INIT sets up autoconf and must be first macro. -AC_INIT([mathic], [1.0]) # package, version, bug-report-email +AC_INIT([mathic], [1.1]) # package, version, bug-report-email # set up information about directories AC_CONFIG_MACRO_DIR([build/autotools/m4]) # directory of extra autoconf macroes @@ -98,7 +98,7 @@ LT_INIT([disable-shared]) dnl Set the version for the library -- this concerns compatibility of the dnl source and binary interface of the library and is not the same as the dnl version of the project. -AC_SUBST([MATHIC_SO_VERSION], [0:0:0]) +AC_SUBST([MATHIC_SO_VERSION], [0:1:0]) dnl Set up AC_OUTPUT to create each file by copying an input file dnl while substituting the output variable values.