concept: str arrays

scivision · scivision · commit 3995514876c3 · 2022-01-23T18:51:38.000-05:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -53,11 +53,6 @@ set_target_properties(c_fortran_struct PROPERTIES LINKER_LANGUAGE C)
 target_compile_definitions(c_fortran_struct PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
 add_test(NAME C_Fortran_struct COMMAND c_fortran_struct)
 
-add_executable(c_fortran_string_array c/string_array_main.c)
-target_link_libraries(c_fortran_string_array PRIVATE string_array_fortran)
-set_target_properties(c_fortran_string_array PROPERTIES LINKER_LANGUAGE C)
-add_test(NAME C_Fortran_string_array COMMAND c_fortran_string_array)
-
 # -- C++ calling Fortran
 add_executable(cxx_call_fortran cxx/math_main.cxx)
 target_link_libraries(cxx_call_fortran PRIVATE math_fortran)
diff --git a/src/concepts/CMakeLists.txt b/src/concepts/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library(string_array_fortran OBJECT string_array_lib.f90)
+
+
+add_executable(c_fortran_string_array c/string_array_main.c)
+target_link_libraries(c_fortran_string_array PRIVATE string_array_fortran)
+set_target_properties(c_fortran_string_array PROPERTIES LINKER_LANGUAGE C)
+add_test(NAME C_Fortran_string_array COMMAND c_fortran_string_array)
diff --git a/src/concepts/meson.build b/src/concepts/meson.build
@@ -0,0 +1,9 @@
+string_array_fortran = library('string_array_fortran', 'string_array_lib.f90')
+
+
+c_fortran_string_array = executable('c_fortran_string_array',
+  sources: files('c/string_array_main.c'),
+  link_with: string_array_fortran,
+  link_language: 'fortran'
+)
+test('C Fortran string array', c_fortran_string_array, timeout: 5)
diff --git a/src/concepts/string_array_lib.f90 b/src/concepts/string_array_lib.f90
diff --git a/src/concepts/string_array_main.c b/src/concepts/string_array_main.c
diff --git a/src/fortran/CMakeLists.txt b/src/fortran/CMakeLists.txt
@@ -3,5 +3,3 @@ add_library(math_fortran OBJECT math_lib.f90)
 add_library(error_fortran OBJECT error_lib.f90)
 
 add_library(struct_fortran OBJECT struct_lib.f90)
-
-add_library(string_array_fortran OBJECT string_array_lib.f90)
diff --git a/src/fortran/meson.build b/src/fortran/meson.build
@@ -3,5 +3,3 @@ math_fortran = library('math_fortran', 'math_lib.f90')
 error_fortran = library('error_fortran', 'error_lib.f90')
 
 struct_fortran = library('struct_fortran', 'struct_lib.f90')
-
-string_array_fortran = library('string_array_fortran', 'string_array_lib.f90')
diff --git a/src/meson.build b/src/meson.build
@@ -73,13 +73,6 @@ c_fortran_struct = executable('c_fortran_struct',
 )
 test('C Fortran struct', c_fortran_struct, timeout: 5)
 
-c_fortran_string_array = executable('c_fortran_string_array',
-  sources: files('c/string_array_main.c'),
-  link_with: string_array_fortran,
-  link_language: 'fortran'
-)
-test('C Fortran string array', c_fortran_string_array, timeout: 5)
-
 # -- C++ calling Fortran
 cxx_call_fortran = executable('cxx_call_fortran',
   sources: files('cxx/math_main.cxx'),
