struct: use header file my_struct.h

Author: scivision

src/CMakeLists.txt

@@ -53,6 +53,7 @@ add_test(NAME C++_Fortran_error
 )
 
 add_executable(cxx_fortran_struct cxx/struct_main.cxx)
+target_include_directories(cxx_fortran_struct PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/c)
 target_link_libraries(cxx_fortran_struct PRIVATE struct_fortran)
 set_target_properties(cxx_fortran_struct PROPERTIES LINKER_LANGUAGE CXX)
 add_test(NAME C++_Fortran_struct COMMAND $<TARGET_FILE:cxx_fortran_struct>)

src/c/my_struct.h

@@ -0,0 +1,18 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum { LMAX = 1000 };
+
+struct params {
+  // order and lengths must match in Fortran and C
+  int my_int;
+  bool my_bool;
+  char my_char[LMAX];
+};
+
+void struct_check(struct params);
+
+#ifdef __cplusplus
+}
+#endif

src/c/struct_lib.c

@@ -3,14 +3,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-struct params {
-  // order and lengths must match in Fortran and C
-  int my_int;
-  bool my_bool;
-  char my_char[1000];
-};
+#include "my_struct.h"
 
-void struct_check(struct params);
 
 void struct_check(struct params s) {
 

src/c/struct_main.c

@@ -2,16 +2,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-enum { Lchar = 1000 };
-
-struct params {
-  // order and lengths must match in Fortran and C
-  int my_int;
-  bool my_bool;
-  char my_char[Lchar];
-};
-
-extern void struct_check(struct params *);
+#include "my_struct.h"
 
 int main(void) {
 
@@ -21,7 +12,7 @@ s.my_int = 123;
 s.my_bool = true;
 strcpy(s.my_char, "Hello");
 
-struct_check(&s);
+struct_check(s);
 
 return EXIT_SUCCESS;
 

src/cxx/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_library(math_cxx OBJECT math_lib.cxx)
 
 add_library(struct_cxx OBJECT struct_lib.cxx)
+target_include_directories(struct_cxx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../c)

src/cxx/struct_lib.cxx

@@ -2,14 +2,7 @@
 #include <cstring>
 #include <cstdlib>
 
-struct params {
-  // order and lengths must match in Fortran and C
-  int my_int;
-  bool my_bool;
-  char my_char[1000];
-};
-
-extern "C" void struct_check(struct params);
+#include "my_struct.h"
 
 void struct_check(struct params s) {
 

src/cxx/struct_main.cxx

@@ -1,14 +1,7 @@
 #include <cstring>
 #include <cstdlib>
 
-struct params {
-  // order and lengths must match in Fortran and C
-  int my_int;
-  bool my_bool;
-  char my_char[1000];
-};
-
-extern "C" void struct_check(struct params *);
+#include "my_struct.h"
 
 int main() {
 
@@ -18,7 +11,7 @@ s.my_int = 123;
 s.my_bool = true;
 strcpy(s.my_char, "Hello");
 
-struct_check(&s);
+struct_check(s);
 
 return EXIT_SUCCESS;