harmonize names

Author: scivision

meson.build

@@ -1,5 +1,5 @@
 project('Fortran_c_cxx_interface', 'c', 'cpp', 'fortran',
-version : '1.2.0',
+version : '1.2.1',
 meson_version: '>= 0.52.0',
 default_options : ['default_library=static', 'warning_level=3',
 'cpp_std=c++11', 'c_std=c99'])

src/CMakeLists.txt

@@ -31,7 +31,7 @@ set_target_properties(c_fortran_struct PROPERTIES LINKER_LANGUAGE C)
 add_test(NAME C_Fortran_struct COMMAND $<TARGET_FILE:c_fortran_struct>)
 
 # -- C++ calling Fortran
-add_executable(cxx_call_fortran cxx/main.cxx)
+add_executable(cxx_call_fortran cxx/math_main.cxx)
 target_link_libraries(cxx_call_fortran PRIVATE math_fortran)
 add_test(NAME C++_Fortran_math COMMAND cxx_call_fortran)
 

src/c/CMakeLists.txt

@@ -1 +1 @@
-add_library(math_c OBJECT math.c)
+add_library(math_c OBJECT math_lib.c)

src/c/math.c renamed to src/c/math_lib.c

@@ -1 +1 @@
-math_c = library('math_c', 'math.c')
+math_c = library('math_c', 'math_lib.c')

src/c/meson.build

@@ -1 +1 @@
-add_library(math_cxx OBJECT math.cxx)
+add_library(math_cxx OBJECT math_lib.cxx)

src/cxx/CMakeLists.txt

@@ -1 +1 @@
-math_cxx = library('math_cxx', 'math.cxx')
+math_cxx = library('math_cxx', 'math_lib.cxx')

src/cxx/math.cxx renamed to src/cxx/math_lib.cxx

@@ -1,5 +1,5 @@
-add_library(math_fortran OBJECT math.f90)
+add_library(math_fortran OBJECT math_lib.f90)
 
-add_library(error_fortran OBJECT error.f90)
+add_library(error_fortran OBJECT error_lib.f90)
 
-add_library(struct_fortran OBJECT struct.f90)
+add_library(struct_fortran OBJECT struct_lib.f90)

src/cxx/main.cxx renamed to src/cxx/math_main.cxx

@@ -1,5 +1,5 @@
-math_fortran = library('math_fortran', 'math.f90')
+math_fortran = library('math_fortran', 'math_lib.f90')
 
-error_fortran = library('error_fortran', 'error.f90')
+error_fortran = library('error_fortran', 'error_lib.f90')
 
-struct_fortran = library('struct_fortran', 'struct.f90')
+struct_fortran = library('struct_fortran', 'struct_lib.f90')

src/cxx/meson.build

@@ -41,7 +41,7 @@ test('C Fortran struct', c_fortran_struct,
 
 # -- C++ calling Fortran
 cxx_call_fortran = executable('cxx_call_fortran',
-  sources: files('cxx/main.cxx'),
+  sources: files('cxx/math_main.cxx'),
   link_with: math_fortran
 )
 test('C++ call Fortran', cxx_call_fortran, timeout: 5)