From 186c9159685413a1aeefe3524986750aeb31775c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1lint=20Aradi?= Date: Wed, 13 Nov 2024 23:51:23 +0100 Subject: [PATCH] Make minor fixes in export tests (#37) --- CMakeLists.txt | 2 +- LICENSE => LICENSE.txt | 0 README.rst | 14 ++++++-- devel/fpm-repo/coarray/addons/LICENSE | 47 ------------------------- devel/fpm-repo/coarray/repo.include | 2 +- devel/fpm-repo/common/addons/README.rst | 2 +- devel/fpm-repo/mpi/addons/LICENSE | 47 ------------------------- devel/fpm-repo/mpi/repo.include | 2 +- devel/fpm-repo/serial/addons/LICENSE | 47 ------------------------- devel/fpm-repo/serial/repo.include | 2 +- test/export/coarray/CMakeLists.txt | 6 ++-- test/export/coarray/meson.build | 1 + test/export/mpi/CMakeLists.txt | 6 ++-- test/export/mpi/meson.build | 6 +++- test/export/serial/CMakeLists.txt | 8 ++--- test/export/serial/meson.build | 6 +++- 16 files changed, 37 insertions(+), 161 deletions(-) rename LICENSE => LICENSE.txt (100%) delete mode 100644 devel/fpm-repo/coarray/addons/LICENSE delete mode 100644 devel/fpm-repo/mpi/addons/LICENSE delete mode 100644 devel/fpm-repo/serial/addons/LICENSE diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d2b7bf..d457f14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/README.rst b/README.rst index 66fe5b7..ef89182 100644 --- a/README.rst +++ b/README.rst @@ -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. @@ -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 @@ -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 `_. +Fortuno is licensed under the `BSD-2-Clause Plus Patent License `_. This `OSI-approved `_ license combines the 2-clause BSD license with an explicit patent grant from contributors. The SPDX license identifier for this project is diff --git a/devel/fpm-repo/coarray/addons/LICENSE b/devel/fpm-repo/coarray/addons/LICENSE deleted file mode 100644 index 05c69ec..0000000 --- a/devel/fpm-repo/coarray/addons/LICENSE +++ /dev/null @@ -1,47 +0,0 @@ -Copyright (c) 2024 Fortuno authors - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -Subject to the terms and conditions of this license, each copyright holder and -contributor hereby grants to those receiving rights under this license a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except for failure to satisfy the conditions of this license) patent license to -make, have made, use, offer to sell, sell, import, and otherwise transfer this -software, where such license applies only to those patent claims, already -acquired or hereafter acquired, licensable by such copyright holder or -contributor that are necessarily infringed by: - -(a) their Contribution(s) (the licensed copyrights of copyright holders and - non-copyrightable additions of contributors, in source or binary form) - alone; or - -(b) combination of their Contribution(s) with the work of authorship to which - such Contribution(s) was added by such copyright holder or contributor, if, - at the time the Contribution is added, such addition causes such combination - to be necessarily infringed. The patent license shall not apply to any other - combinations which include the Contribution. - -Except as expressly stated above, no rights or licenses from any copyright -holder or contributor is granted under this license, whether expressly, by -implication, estoppel or otherwise. - -DISCLAIMER - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/devel/fpm-repo/coarray/repo.include b/devel/fpm-repo/coarray/repo.include index 380d5dc..8249207 100644 --- a/devel/fpm-repo/coarray/repo.include +++ b/devel/fpm-repo/coarray/repo.include @@ -1,4 +1,4 @@ -LICENSE +LICENSE.txt include/ include/fortuno_coarray.fpp src/ diff --git a/devel/fpm-repo/common/addons/README.rst b/devel/fpm-repo/common/addons/README.rst index 73c88b6..d9a1f0e 100644 --- a/devel/fpm-repo/common/addons/README.rst +++ b/devel/fpm-repo/common/addons/README.rst @@ -57,7 +57,7 @@ visit the `Fortuno repository `_. License ======= -Fortuno is licensed under the `BSD-2-Clause Plus Patent License `_. +Fortuno is licensed under the `BSD-2-Clause Plus Patent License `_. This `OSI-approved `_ license combines the 2-clause BSD license with an explicit patent grant from contributors. The SPDX license identifier for this project is diff --git a/devel/fpm-repo/mpi/addons/LICENSE b/devel/fpm-repo/mpi/addons/LICENSE deleted file mode 100644 index 05c69ec..0000000 --- a/devel/fpm-repo/mpi/addons/LICENSE +++ /dev/null @@ -1,47 +0,0 @@ -Copyright (c) 2024 Fortuno authors - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -Subject to the terms and conditions of this license, each copyright holder and -contributor hereby grants to those receiving rights under this license a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except for failure to satisfy the conditions of this license) patent license to -make, have made, use, offer to sell, sell, import, and otherwise transfer this -software, where such license applies only to those patent claims, already -acquired or hereafter acquired, licensable by such copyright holder or -contributor that are necessarily infringed by: - -(a) their Contribution(s) (the licensed copyrights of copyright holders and - non-copyrightable additions of contributors, in source or binary form) - alone; or - -(b) combination of their Contribution(s) with the work of authorship to which - such Contribution(s) was added by such copyright holder or contributor, if, - at the time the Contribution is added, such addition causes such combination - to be necessarily infringed. The patent license shall not apply to any other - combinations which include the Contribution. - -Except as expressly stated above, no rights or licenses from any copyright -holder or contributor is granted under this license, whether expressly, by -implication, estoppel or otherwise. - -DISCLAIMER - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/devel/fpm-repo/mpi/repo.include b/devel/fpm-repo/mpi/repo.include index 7e0943b..15851a6 100644 --- a/devel/fpm-repo/mpi/repo.include +++ b/devel/fpm-repo/mpi/repo.include @@ -1,4 +1,4 @@ -LICENSE +LICENSE.txt include/ include/fortuno_mpi.fpp src/ diff --git a/devel/fpm-repo/serial/addons/LICENSE b/devel/fpm-repo/serial/addons/LICENSE deleted file mode 100644 index 05c69ec..0000000 --- a/devel/fpm-repo/serial/addons/LICENSE +++ /dev/null @@ -1,47 +0,0 @@ -Copyright (c) 2024 Fortuno authors - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -Subject to the terms and conditions of this license, each copyright holder and -contributor hereby grants to those receiving rights under this license a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except for failure to satisfy the conditions of this license) patent license to -make, have made, use, offer to sell, sell, import, and otherwise transfer this -software, where such license applies only to those patent claims, already -acquired or hereafter acquired, licensable by such copyright holder or -contributor that are necessarily infringed by: - -(a) their Contribution(s) (the licensed copyrights of copyright holders and - non-copyrightable additions of contributors, in source or binary form) - alone; or - -(b) combination of their Contribution(s) with the work of authorship to which - such Contribution(s) was added by such copyright holder or contributor, if, - at the time the Contribution is added, such addition causes such combination - to be necessarily infringed. The patent license shall not apply to any other - combinations which include the Contribution. - -Except as expressly stated above, no rights or licenses from any copyright -holder or contributor is granted under this license, whether expressly, by -implication, estoppel or otherwise. - -DISCLAIMER - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/devel/fpm-repo/serial/repo.include b/devel/fpm-repo/serial/repo.include index 592d370..7a720a1 100644 --- a/devel/fpm-repo/serial/repo.include +++ b/devel/fpm-repo/serial/repo.include @@ -1,4 +1,4 @@ -LICENSE +LICENSE.txt include/ include/fortuno_serial.fpp src/ diff --git a/test/export/coarray/CMakeLists.txt b/test/export/coarray/CMakeLists.txt index e5405f9..c7e4003 100644 --- a/test/export/coarray/CMakeLists.txt +++ b/test/export/coarray/CMakeLists.txt @@ -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 @@ -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 diff --git a/test/export/coarray/meson.build b/test/export/coarray/meson.build index b31da0f..cf54c19 100644 --- a/test/export/coarray/meson.build +++ b/test/export/coarray/meson.build @@ -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}, ) diff --git a/test/export/mpi/CMakeLists.txt b/test/export/mpi/CMakeLists.txt index c855de0..bec7779 100644 --- a/test/export/mpi/CMakeLists.txt +++ b/test/export/mpi/CMakeLists.txt @@ -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 @@ -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 diff --git a/test/export/mpi/meson.build b/test/export/mpi/meson.build index b17dd99..c4dbcd4 100644 --- a/test/export/mpi/meson.build +++ b/test/export/mpi/meson.build @@ -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 diff --git a/test/export/serial/CMakeLists.txt b/test/export/serial/CMakeLists.txt index 631eb6e..3230056 100644 --- a/test/export/serial/CMakeLists.txt +++ b/test/export/serial/CMakeLists.txt @@ -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}") diff --git a/test/export/serial/meson.build b/test/export/serial/meson.build index f98901c..10dec5f 100644 --- a/test/export/serial/meson.build +++ b/test/export/serial/meson.build @@ -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