Skip to content

Commit

Permalink
Merge pull request #11 from fortran-lang/release/v0.8.2
Browse files Browse the repository at this point in the history
build: update for fpm v0.8.2
  • Loading branch information
gnikit authored May 14, 2023
2 parents 0afa9f3 + 7893e70 commit 84d07c6
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 @@ -12,8 +12,9 @@ endif()

# Set Git tags for dependencies
set(M_CLI2_TAG "7264878cdb1baff7323cc48596d829ccfe7751b8" CACHE STRING "Set git tag for M_CLI2")
set(JONQUIL_TAG "05d30818bb12fb877226ce284b9a3a41b971a889" CACHE STRING "Set git tag for jonquil")
set(FPM_TAG "v0.8.1" CACHE STRING "Set git tag for fpm")
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(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 @@ -86,6 +87,15 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)

add_executable(${BIN_NAME} ${SRC_FILES} ${fpm_src_SOURCE_DIR}/app/main.f90)

# version preproc tag was added in fpm 0.8.2
target_compile_definitions(${BIN_NAME} PRIVATE FPM_RELEASE_VERSION=${FPM_VERSION})

# HACK: circumvent compiler's default preprocessor heuristic and enable it
# globally. This is to circumvent sr/fpm/fpm_release.f90 erroneous lowecase
# file extension.
# Remove in the next fpm release
target_compile_options(${BIN_NAME} PRIVATE "-cpp")

if(OpenMP_Fortran_FOUND)
message(STATUS "OpenMP Fortran found: Building fpm for parallel execution")
target_link_libraries(${BIN_NAME} PUBLIC OpenMP::OpenMP_Fortran)
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.1"
version = "0.8.2"
license = { text = "MIT License" }
authors = [{ name = "fpm maintainers" }]
requires-python = ">=3.7"
Expand Down

0 comments on commit 84d07c6

Please sign in to comment.