diff --git a/modules/version.cmake b/modules/version.cmake index 1255fd1..5fce278 100644 --- a/modules/version.cmake +++ b/modules/version.cmake @@ -3,7 +3,8 @@ # Determine program version from file "VERSION" (example: "14.1") # The reason why this information is stored # in a file and not as CMake variable is that CMake-unaware programs can parse -# and use it (e.g. Sphinx). +# and use it (e.g. Sphinx). Also web-based hosting frontends such as GitLab +# automatically use a file "VERSION". # # Defines:: # diff --git a/test/fortran/cmake/autocmake.cfg b/test/fc/cmake/autocmake.cfg similarity index 80% rename from test/fortran/cmake/autocmake.cfg rename to test/fc/cmake/autocmake.cfg index a273ca4..f75b91c 100644 --- a/test/fortran/cmake/autocmake.cfg +++ b/test/fc/cmake/autocmake.cfg @@ -6,6 +6,9 @@ source: https://github.com/scisoft/autocmake/raw/master/modules/fc.cmake docopt: --fc= Fortran compiler [default: gfortran]. export: 'FC=%s' % arguments['--fc'] +[compilers] +source: https://github.com/scisoft/autocmake/raw/master/compilers/GNU.Fortran.cmake + [default_build_paths] source: https://github.com/scisoft/autocmake/raw/master/modules/default_build_paths.cmake diff --git a/test/fortran/src/CMakeLists.txt b/test/fc/src/CMakeLists.txt similarity index 100% rename from test/fortran/src/CMakeLists.txt rename to test/fc/src/CMakeLists.txt diff --git a/test/fortran/src/example.f90 b/test/fc/src/example.f90 similarity index 100% rename from test/fortran/src/example.f90 rename to test/fc/src/example.f90 diff --git a/test/test.py b/test/test.py index ef5bfc0..6312f21 100644 --- a/test/test.py +++ b/test/test.py @@ -27,14 +27,14 @@ def test_cxx(): #------------------------------------------------------------------------------- -def test_fortran(): - os.chdir(os.path.join(HERE, 'fortran', 'cmake')) +def test_fc(): + os.chdir(os.path.join(HERE, 'fc', 'cmake')) stdout, stderr = exe('wget https://github.com/scisoft/autocmake/raw/master/update.py') stdout, stderr = exe('python update.py --self') stdout, stderr = exe('python update.py ..') - os.chdir(os.path.join(HERE, 'fortran')) + os.chdir(os.path.join(HERE, 'fc')) stdout, stderr = exe('python setup.py --fc=gfortran') - os.chdir(os.path.join(HERE, 'fortran', 'build')) + os.chdir(os.path.join(HERE, 'fc', 'build')) stdout, stderr = exe('make') stdout, stderr = exe('./bin/example') assert 'Hello World!' in stdout