no preprocessor, add meson

Author: scivision

CMakeLists.txt

@@ -14,6 +14,4 @@ add_subdirectory(src)
 add_executable(testiri90 src/iritest.for)
 target_link_libraries(testiri90 iri90)
 
-add_executable(iri90_driver src/iri90.f src/iri90_driver.F90)
-target_compile_definitions(iri90_driver PRIVATE
-  BIN_DIR='${CMAKE_CURRENT_BINARY_DIR}')
+add_executable(iri90_driver src/iri90.f src/iri90_driver.f90)

meson.build

@@ -0,0 +1,15 @@
+project('iri90', 'fortran',
+  default_options : ['default_library=static', 'buildtype=release'])
+
+fc = meson.get_compiler('fortran')
+if fc.get_id() == 'gcc'
+  old = '-std=legacy'
+endif
+
+subdir('src')
+
+# testiri90 is an interactive program, not for CI
+testiri90_exe = executable('testiri90', 'src/iritest.for',
+  link_with: iri90_lib)
+
+iri90_driver_exe = executable('iri90_driver', 'src/iri90.f', 'src/iri90_driver.f90')

src/iri90_driver.F90 renamed to src/iri90_driver.f90

@@ -1,4 +1,3 @@
-program basictest
 use, intrinsic:: iso_fortran_env, only: stderr=>error_unit, stdout=>output_unit
 implicit none
 
@@ -14,10 +13,7 @@ program basictest
 character(80) :: argv
 integer :: i, argc
 
-#ifndef BIN_DIR
-#define BIN_DIR '.'
-#endif
-character(*), parameter :: datadir = BIN_DIR // '/../iri90/data/'
+character(:), allocatable :: datadir
 
 
 jf = .true.
@@ -45,10 +41,13 @@ program basictest
 call get_command_argument(9, argv)
 read(argv,*) f107a
 
-Nalt = argc-9
+call get_command_argument(10, argv)
+datadir = trim(argv)
+
+Nalt = argc-10
 allocate(altkm(Nalt), outf(11,Nalt))
 do i = 1,Nalt
-  call get_command_argument(9+i, argv)
+  call get_command_argument(10+i, argv)
   read(argv,*) altkm(i)
 enddo
 
@@ -72,9 +71,7 @@ program basictest
   write(stdout, '(F10.3, 11ES16.8)') altkm(i), outf(:11,i)
 enddo
 
-print *,new_line(' ')
 
-write(stdout, '(100ES16.8)') oarr
+write(stdout, '(/,100ES16.8)') oarr
 
 end program
-

src/meson.build

@@ -0,0 +1,2 @@
+iri90_lib = library('iri90', 'iridreg.for', 'iritec.for', 'igrf.for', 'cira.for', 'irifun.for', 'iriflip.for', 'irisub.for',
+  fortran_args: old)