Skip to content

Commit

Permalink
Merge pull request #12 from fortran-lang/release/v0.9.0
Browse files Browse the repository at this point in the history
build: updated version number to v0.9.0
  • Loading branch information
gnikit authored Jun 5, 2023
2 parents 84d07c6 + 74475b2 commit 8b7f70b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
14 changes: 12 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ endif()
# Set Git tags for dependencies
set(M_CLI2_TAG "7264878cdb1baff7323cc48596d829ccfe7751b8" CACHE STRING "Set git tag for M_CLI2")
set(JONQUIL_TAG "4c27c8c1e411fa8790dffcf8c3fa7a27b6322273" CACHE STRING "Set git tag for jonquil")
set(FPM_VERSION "0.8.2" CACHE STRING "Set fpm version e.g. 8.0.0")
set(REGEX_TAG "1.1.2" CACHE STRING "Set git tag for Fortran-regex")
set(FPM_VERSION "0.9.0" CACHE STRING "Set fpm version e.g. 8.0.0")
set(FPM_TAG "v${FPM_VERSION}" CACHE STRING "Set git tag for fpm, default is v${FPM_VERSION}")

set(BIN_NAME ${CMAKE_PROJECT_NAME})
Expand Down Expand Up @@ -50,7 +51,15 @@ FetchContent_Declare(
GIT_TAG ${JONQUIL_TAG}
SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/jonquil"
)
FetchContent_MakeAvailable(fpm_src m_cli2_src jonquil_src)

FetchContent_Declare(
regex_src
GIT_REPOSITORY "https://github.com/perazz/fortran-regex"
GIT_TAG ${REGEX_TAG}
SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/fortran-regex"
)

FetchContent_MakeAvailable(fpm_src m_cli2_src jonquil_src regex_src)

# Get toml-f's source dir from within jonquil's source dir
# FetchContent_Declare is first come first serve in terms of target names
Expand All @@ -76,6 +85,7 @@ file(GLOB_RECURSE
${m_cli2_src_SOURCE_DIR}/src/M_CLI2*.f90
${jonquil_src_SOURCE_DIR}/src/*.f90
${TOML_FORTRAN_SOURCE_DIR}/src/*.f90
${regex_src_SOURCE_DIR}/src/*.f90
${fpm_src_SOURCE_DIR}/src/*.f90
${fpm_src_SOURCE_DIR}/src/*.F90
${fpm_src_SOURCE_DIR}/src/*.h
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "fpm"
version = "0.8.2"
version = "0.9.0"
license = { text = "MIT License" }
authors = [{ name = "fpm maintainers" }]
requires-python = ">=3.7"
Expand Down

0 comments on commit 8b7f70b

Please sign in to comment.