Make minor fixes in export tests

fortuno-repos · Nov 13, 2024 · 7077241 · 7077241
1 parent 3036311
commit 7077241
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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