Skip to content

Commit

Permalink
Merge pull request #53 from veprbl/pr/APFEL_VERSION_fix
Browse files Browse the repository at this point in the history
CMakeLists.txt: define APFEL_VERSION, like in config.h.in
  • Loading branch information
scarrazza authored Dec 9, 2023
2 parents 1f9f921 + 939aa1b commit 8be0c3b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,22 @@ jobs:
runs-on: ubuntu-latest
container:
image: fedora:latest
env:
CFLAGS: -fsanitize=address
CXXFLAGS: -fsanitize=address
FFLAGS: -fsanitize=address
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install
run: |
yum -y install gcc gcc-c++ gcc-gfortran make wget which cmake cmake-data cmake-filesystem lhapdf lhapdf-devel swig python-devel
yum -y install gcc gcc-c++ gcc-gfortran libasan make wget which cmake cmake-data cmake-filesystem lhapdf lhapdf-devel swig python-devel
- name: Compile
run: |
cmake -S . -B BUILD -DCMAKE_INSTALL_PREFIX=$(pwd)/../INSTALL
cmake --build BUILD -j
cmake --install BUILD
ctest --test-dir BUILD -j 2
ctest --output-on-failure --test-dir BUILD -j 2
compilejobOSX:
Expand All @@ -42,4 +46,4 @@ jobs:
cmake -S . -B BUILD -DCMAKE_INSTALL_PREFIX=$(pwd)/../INSTALL -DCMAKE_Fortran_COMPILER=gfortran-13
cmake --build BUILD -j 2
cmake --install BUILD
ctest --test-dir BUILD -j 2
ctest --output-on-failure --test-dir BUILD -j 2
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ set(PROJECT_VERSION 3.0.7)
SET(APFEL_VERSION_MAJOR 3)
SET(APFEL_VERSION_MINOR 0)
SET(APFEL_VERSION_PATCH 7)
add_compile_definitions(APFEL_VERSION=${apfel_VERSION})
set(CMAKE_VERBOSE_MAKEFILE OFF)
include("GNUInstallDirs")

Expand Down

0 comments on commit 8be0c3b

Please sign in to comment.