From 681e4add145a71735da85193403d77abec8bb0ef Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Sun, 8 Nov 2020 17:00:35 +0100 Subject: Add package with external dependency - BLAS is installed on the OSX and Linux image, but not on Windows --- ci/run_tests.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ci') diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 625f37b..d5d3045 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -69,3 +69,7 @@ cd ../submodules cd ../program_with_module "${f_fpm_path}" build ./build/gfortran_debug/app/Program_with_module + +cd ../link_external +"${f_fpm_path}" build +./build/gfortran_debug/app/link_external -- cgit v1.2.3 From fcc971fd8703c37b8e0e02dabfe95138b4979309 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Tue, 10 Nov 2020 20:28:43 +0100 Subject: Allow external link dependencies with scope limited to targets - move reader for string list to toml-f proxy - allow link entry in executable and test tables - bump toml-f version to v0.2.1 - add example package linking a single executable against gomp --- ci/run_tests.bat | 10 ++++++++++ ci/run_tests.sh | 4 ++++ 2 files changed, 14 insertions(+) (limited to 'ci') diff --git a/ci/run_tests.bat b/ci/run_tests.bat index 0c0339c..44f6e5c 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -132,3 +132,13 @@ if errorlevel 1 exit 1 .\build\gfortran_debug\app\Program_with_module if errorlevel 1 exit 1 + + +cd ..\link_executable +if errorlevel 1 exit 1 + +%fpm_path% build +if errorlevel 1 exit 1 + +.\build\gfortran_debug\app\gomp_test +if errorlevel 1 exit 1 diff --git a/ci/run_tests.sh b/ci/run_tests.sh index d5d3045..894b1f0 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -73,3 +73,7 @@ cd ../program_with_module cd ../link_external "${f_fpm_path}" build ./build/gfortran_debug/app/link_external + +cd ../link_executable +"${f_fpm_path}" build +./build/gfortran_debug/app/gomp_test -- cgit v1.2.3