Skip to content

Commit

Permalink
Make minor fixes in export tests (#37)
Browse files Browse the repository at this point in the history
  • Loading branch information
aradi authored Nov 13, 2024
1 parent 3036311 commit 186c915
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 161 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Basic project definition #
]=================================================================================================]

cmake_minimum_required(VERSION 3.22...3.28)
cmake_minimum_required(VERSION 3.22...3.31)

list(APPEND CMAKE_MESSAGE_CONTEXT Fortuno)

Expand Down
File renamed without changes.
14 changes: 11 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,11 @@ your system and use the installed version during the build. This can be useful
for avoiding repeated downloads as well as for using Fortuno with other build
systems (e.g. Make).

To install Fortuno, you must follow the standard CMake workflow:

Installing from source
.......................

To install Fortuno from the downloaded source, you must follow the standard CMake workflow:

* Review the ``config.cmake`` file for variables that allow you to customize the
build.
Expand All @@ -197,8 +201,12 @@ To install Fortuno, you must follow the standard CMake workflow:

cmake --install build


Using the installed library
...........................

How you integrate the installed Fortuno library into your project depends on the
build system you are using:
build system you are using for your project:

* **CMake**: Follow the CMake instructions outlined earlier. Ensure the
``CMAKE_PREFIX_PATH`` environment variable includes Fortuno's installation
Expand Down Expand Up @@ -417,7 +425,7 @@ consider opening a pull request to update this table.
License
=======

Fortuno is licensed under the `BSD-2-Clause Plus Patent License <LICENSE>`_.
Fortuno is licensed under the `BSD-2-Clause Plus Patent License <LICENSE.txt>`_.
This `OSI-approved <https://opensource.org/licenses/BSDplusPatent>`_ license
combines the 2-clause BSD license with an explicit patent grant from
contributors. The SPDX license identifier for this project is
Expand Down
47 changes: 0 additions & 47 deletions devel/fpm-repo/coarray/addons/LICENSE

This file was deleted.

2 changes: 1 addition & 1 deletion devel/fpm-repo/coarray/repo.include
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LICENSE
LICENSE.txt
include/
include/fortuno_coarray.fpp
src/
Expand Down
2 changes: 1 addition & 1 deletion devel/fpm-repo/common/addons/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ visit the `Fortuno repository <https://github.com/fortuno-repos/fortuno>`_.
License
=======

Fortuno is licensed under the `BSD-2-Clause Plus Patent License <LICENSE>`_.
Fortuno is licensed under the `BSD-2-Clause Plus Patent License <LICENSE.txt>`_.
This `OSI-approved <https://opensource.org/licenses/BSDplusPatent>`_ license
combines the 2-clause BSD license with an explicit patent grant from
contributors. The SPDX license identifier for this project is
Expand Down
47 changes: 0 additions & 47 deletions devel/fpm-repo/mpi/addons/LICENSE

This file was deleted.

2 changes: 1 addition & 1 deletion devel/fpm-repo/mpi/repo.include
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LICENSE
LICENSE.txt
include/
include/fortuno_mpi.fpp
src/
Expand Down
47 changes: 0 additions & 47 deletions devel/fpm-repo/serial/addons/LICENSE

This file was deleted.

2 changes: 1 addition & 1 deletion devel/fpm-repo/serial/repo.include
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LICENSE
LICENSE.txt
include/
include/fortuno_serial.fpp
src/
Expand Down
6 changes: 3 additions & 3 deletions test/export/coarray/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the BSD-2-Clause Plus Patent license.
# SPDX-License-Identifier: BSD-2-Clause-Patent

cmake_minimum_required(VERSION 3.22...3.28)
cmake_minimum_required(VERSION 3.22...3.31)

project(
FortunoCoarray_Test_Export
Expand All @@ -11,12 +11,12 @@ project(
LANGUAGES Fortran
)

find_package(Fortuno REQUIRED)
find_package(Fortuno 0.1.0 EXACT REQUIRED)
if (NOT TARGET Fortuno::fortuno_coarray)
message(FATAL_ERROR "Fortuno library was built without the coarray interface")
endif ()

find_program(FYPP fypp REQUIRED)
find_program(FYPP fypp)
if (FYPP)
get_target_property(
_fortuno_incdir
Expand Down
1 change: 1 addition & 0 deletions test/export/coarray/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ testapp_fpp_deps = []

fortuno_coarray_dep = dependency(
'fortuno_coarray',
version: '= 0.1.0',
fallback: ['fortuno', 'fortuno_coarray_dep'],
default_options: {'fflags_coarray': fflags_coarray, 'ldflags_coarray': ldflags_coarray},
)
Expand Down
6 changes: 3 additions & 3 deletions test/export/mpi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the BSD-2-Clause Plus Patent license.
# SPDX-License-Identifier: BSD-2-Clause-Patent

cmake_minimum_required(VERSION 3.22...3.28)
cmake_minimum_required(VERSION 3.22...3.31)

project(
FortunoMpi_Test_Export
Expand All @@ -12,12 +12,12 @@ project(
)

find_package(MPI REQUIRED)
find_package(Fortuno REQUIRED)
find_package(Fortuno 0.1.0 EXACT REQUIRED)
if (NOT TARGET Fortuno::fortuno_mpi)
message(FATAL_ERROR "Fortuno library was built without the MPI interface")
endif ()

find_program(FYPP fypp REQUIRED)
find_program(FYPP fypp)
if (FYPP)
get_target_property(
_fortuno_incdir
Expand Down
6 changes: 5 additions & 1 deletion test/export/mpi/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ fortran_mpi_dep = dependency('mpi', language: 'fortran', required: true)
testapp_deps += fortran_mpi_dep
testapp_fpp_deps += fortran_mpi_dep

fortuno_mpi_dep = dependency('fortuno_mpi', fallback: ['fortuno', 'fortuno_mpi_dep'])
fortuno_mpi_dep = dependency(
'fortuno_mpi',
version: '= 0.1.0',
fallback: ['fortuno', 'fortuno_mpi_dep']
)
testapp_deps += fortuno_mpi_dep
testapp_fpp_deps += fortuno_mpi_dep

Expand Down
8 changes: 4 additions & 4 deletions test/export/serial/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
# Licensed under the BSD-2-Clause Plus Patent license.
# SPDX-License-Identifier: BSD-2-Clause-Patent

cmake_minimum_required(VERSION 3.22...3.28)
cmake_minimum_required(VERSION 3.22...3.31)

project(
Fortuno_Test_Export
VERSION 0.1.0
VERSION 0.0.0
DESCRIPTION "Testing the CMake build info exported by Fortuno"
LANGUAGES Fortran
)

find_package(Fortuno REQUIRED)
find_program(FYPP fypp REQUIRED)
find_package(Fortuno 0.1.0 EXACT REQUIRED)
find_program(FYPP fypp)
if (FYPP)
get_target_property(_fortuno_incdir Fortuno::fortuno_include_dir INTERFACE_INCLUDE_DIRECTORIES)
set(FYPP_INCOPTS "-I${_fortuno_incdir}")
Expand Down
6 changes: 5 additions & 1 deletion test/export/serial/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ project(
testapp_deps = []
testapp_fpp_deps = []

fortuno_serial_dep = dependency('fortuno_serial', fallback: ['fortuno', 'fortuno_serial_dep'])
fortuno_serial_dep = dependency(
'fortuno_serial',
version: '= 0.1.0',
fallback: ['fortuno', 'fortuno_serial_dep']
)
testapp_deps += fortuno_serial_dep
testapp_fpp_deps += fortuno_serial_dep

Expand Down

0 comments on commit 186c915

Please sign in to comment.