Skip to content

Commit b00895a

Browse files
committed
fix build with fpm-deployment.sh and fypp
1 parent ad6cd9a commit b00895a

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

ci/fpm-deployment.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ destdir="${DESTDIR:-stdlib-fpm}"
99
fypp="${FYPP:-$(which fypp)}"
1010

1111
# Arguments for the fypp preprocessor
12-
fyflags="${FYFLAGS:--DMAXRANK=4}"
12+
fyflags="${FYFLAGS:--DMAXRANK=8}"
1313

1414
# Number of parallel jobs for preprocessing
1515
if [ $(uname) = "Darwin" ]; then
@@ -45,6 +45,12 @@ mkdir -p "$destdir/src" "$destdir/test" "$destdir/example"
4545
find src -maxdepth 1 -iname "*.fypp" \
4646
| cut -f1 -d. | xargs -P "$njob" -I{} "$fypp" "{}.fypp" "$destdir/{}.f90" $fyflags
4747

48+
find test -name "test_*.fypp" -exec cp {} "$destdir/test/" \;
49+
fyflags="${fyflags} -I src"
50+
find $destdir/test -maxdepth 1 -iname "*.fypp" \
51+
| cut -f1 -d. | xargs -P "$njob" -I{} "$fypp" "{}.fypp" "{}.f90" $fyflags
52+
find $destdir/test -name "test_*.fypp" -exec rm {} \;
53+
4854
# Collect stdlib source files
4955
find src -maxdepth 1 -iname "*.f90" -exec cp {} "$destdir/src/" \;
5056
find test -name "test_*.f90" -exec cp {} "$destdir/test/" \;

test/hashmaps/test_maps.fypp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#: include "common.fypp"
12
#:set HASH_NAME = ["fnv_1_hasher", "fnv_1a_hasher", "seeded_nmhash32_hasher", "seeded_nmhash32x_hasher", "seeded_water_hasher"]
23
#:set SIZE_NAME = ["16", "256"]
34
module test_stdlib_chaining_maps

test/string/test_string_assignment.fypp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#: include "common.fypp"
12
! SPDX-Identifier: MIT
23
module test_string_assignment
34
use testdrive, only : new_unittest, unittest_type, error_type, check

test/string/test_string_to_number.fypp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#: include "common.fypp"
12
module test_string_to_number
23
use stdlib_kinds, only: sp, dp, qp
34
use stdlib_str2num, only: to_num

0 commit comments

Comments
 (0)