Skip to content

Commit

Permalink
fix vs clang
Browse files Browse the repository at this point in the history
  • Loading branch information
kjmeagher committed Nov 1, 2024
1 parent e388b1c commit 611f23f
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions subprojects/packagefiles/cfitsio/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ if cc.has_header('unistd.h')
# if cc.has_header_symbol('unistd.h', 'ftruncate')
# add_project_arguments('-DHAVE_FTRUNCATE', language: 'c')
# endif
# else
# add_project_arguments('-DYY_NO_UNISTD_H', language: 'c')
else
add_project_arguments('-DYY_NO_UNISTD_H', language: 'c')
endif


Expand Down Expand Up @@ -229,7 +229,7 @@ if get_option('utils')
executable(
'fitscopy',
'utilities/fitscopy.c',
dependencies: cfitsio_dep,
dependencies: [cfitsio_dep, lib_deps],
install: true,
)
executable(
Expand All @@ -241,42 +241,42 @@ if get_option('utils')
'utilities/fvrf_key.c',
'utilities/fvrf_misc.c',
c_args: '-DSTANDALONE',
dependencies: cfitsio_dep,
dependencies: [cfitsio_dep, lib_deps],
install: true,
)
executable(
'fpack',
'utilities/fpack.c',
'utilities/fpackutil.c',
dependencies: [libm, cfitsio_dep],
dependencies: [cfitsio_dep, lib_deps],
install: true,
)
executable(
'funpack',
'utilities/funpack.c',
'utilities/fpackutil.c',
dependencies: [libm, cfitsio_dep],
dependencies: [cfitsio_dep, lib_deps],
link_with: libcfitsio,
install: true,
)
endif

test(
'cookbook',
executable('cookbook', 'utilities/cookbook.c', dependencies: cfitsio_dep),
executable('cookbook', 'utilities/cookbook.c', dependencies: [cfitsio_dep, lib_deps]),
)
cmp = find_program('test_compare.py')
testprog = executable(
'testprog',
'utilities/testprog.c',
dependencies: cfitsio_dep,
dependencies: [cfitsio_dep, lib_deps],
)
test('testprog', cmp, args: [testprog, meson.current_source_dir()])
if has_fortran
testf77 = executable(
'testf77',
'utilities/testf77.f',
dependencies: cfitsio_dep,
dependencies: [cfitsio_dep, lib_deps],
)
test('testf77', cmp, args: [testf77, meson.current_source_dir()])
endif
Expand All @@ -285,6 +285,6 @@ endif
if cc.get_id() != 'msvc'
benchmark(
'speed',
executable('speed', 'utilities/speed.c', dependencies: cfitsio_dep),
executable('speed', 'utilities/speed.c', dependencies: [cfitsio_dep, lib_deps]),
)
endif

0 comments on commit 611f23f

Please sign in to comment.