work with shared builds

geospace-code · Nov 22, 2021 · 28b1605 · 28b1605
1 parent 81fc93f
commit 28b1605
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/fpm.toml b/fpm.toml
@@ -1,5 +1,5 @@
 name = "maptran3d"
-version = "VERSION"
+version = "1.2.0"
 license = "BSD"
 author = "Michael Hirsch"
 copyright = "2020 Michael Hirsch"

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('MapTran', 'fortran',
   meson_version : '>=0.57.0',
-  default_options : ['default_library=static', 'buildtype=release', 'warning_level=2'])
+  default_options : ['buildtype=release'])
 
 fc = meson.get_compiler('fortran')
 if fc.get_id() == 'intel'

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(test_maptran test_mod.f90 assert.f90)
 target_link_libraries(test_maptran PRIVATE maptran)
-add_test(NAME unit:maptran COMMAND $<TARGET_FILE:test_maptran>)
+add_test(NAME unit:maptran COMMAND test_maptran WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
 
 add_executable(benchmark_maptran benchmark.f90)
 target_link_libraries(benchmark_maptran PRIVATE maptran)
diff --git a/src/tests/meson.build b/src/tests/meson.build
@@ -2,6 +2,6 @@ mtexe = executable('testmaptran',
 sources: ['test_mod.f90', 'assert.f90'],
 link_with : maptran)
 
-test('Maptran' + get_option('realbits'), mtexe, timeout: 30)
+test('Maptran', mtexe, timeout: 30)
 
 executable('benchmark_maptran', 'benchmark.f90', link_with: maptran)