Skip to content

Commit

Permalink
Merge pull request #11 from Goddard-Fortran-Ecosystem/hotfix/enable-t…
Browse files Browse the repository at this point in the history
…esting

Bugfix - enable testing.
  • Loading branch information
tclune authored Mar 11, 2020
2 parents 1af80cd + b92ffa5 commit 6d7a444
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# ------------------------------------------------------------------------ #
cmake_minimum_required (VERSION 3.8.0)
project (PFLOGGER
VERSION 1.3
VERSION 1.3.1
LANGUAGES Fortran)

set (CMAKE_MODULE_PATH
Expand Down Expand Up @@ -64,7 +64,8 @@ add_subdirectory(doc EXCLUDE_FROM_ALL)

find_package (PFUNIT QUIET)
if (PFUNIT_FOUND)
if (NOT TARGET (tests))
enable_testing()
if (NOT TARGET tests)
add_custom_target(tests COMMAND ${CMAKE_CTEST_COMMAND})
endif ()
add_subdirectory(tests EXCLUDE_FROM_ALL)
Expand Down
12 changes: 11 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,24 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased]
## [Unreleased]

### Added

### Changed

### Fixed

## [1.3.1] - 2020-03-11

Bugfix

### Added

### Changed

### Fixed
- Needed to enable cmake testing.

## [1.3.0] - 2020-03-11

Expand Down
1 change: 0 additions & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ set(pf_tests

if (MPI_FOUND)
add_library (mock-mpi MockMpi.F90)
message("huh: ${MPI_Fortran_INCLUDE_DIRS}")
target_include_directories (mock-mpi PRIVATE ${MPI_Fortran_INCLUDE_DIRS})
target_link_libraries (mock-mpi PRIVATE funit)
list (APPEND pf_tests
Expand Down

0 comments on commit 6d7a444

Please sign in to comment.