We have to somehow rely on F2C if we want it.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9370 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/.gitignore b/.gitignore
index 845a93a..0a474a8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ src/supernovae_*.c
 _*.c\r
 include/simgrid_config.h\r
 include/instr/tracing_config.h\r
+include/smpi/smpif.h\r
 src/context_sysv_config.h\r
 src/gras_config.h\r
 src/smpi/smpicc\r

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 9683bdb..5f1ae2b 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -638,6 +638,7 @@ set(libdir ${exec_prefix}/lib)
 set(CMAKE_LINKARGS "${CMAKE_CURRENT_BINARY_DIR}/lib")
 set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/lib:${GTNETS_LIB_PATH}:$LD_LIBRARY_PATH")
 
+configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/smpif.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h @ONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpicc @ONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpif2c.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpif2c @ONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpiff.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpiff @ONLY)
@@ -668,4 +669,4 @@ ${CMAKE_CURRENT_BINARY_DIR}/examples/msg/small_platform_with_routers.xml
 )
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-"${generate_files_to_clean}")
\ No newline at end of file
+"${generate_files_to_clean}")

diff --git a/include/smpi/smpif.h b/include/smpi/smpif.h.in
similarity index 71%
rename from include/smpi/smpif.h
rename to include/smpi/smpif.h.in
index 156c9ea..6f3ccb8 100644 (file)
--- a/include/smpi/smpif.h
+++ b/include/smpi/smpif.h.in
@@ -7,10 +7,17 @@
 #ifndef SMPIF_H
 #define SMPIF_H
 
+#cmakedefine HAVE_F2C_H @HAVE_SMPI_F2C_H@
+
+#ifndef HAVE_F2C_H
+#error F2C is mandatory
+#endif
+
 #include <xbt/misc.h>
+#include <f2c.h>
 
 XBT_PUBLIC(int) smpi_process_argc(void);
-XBT_PUBLIC(int) smpi_process_getarg(int* index, char* dst, size_t len);
+XBT_PUBLIC(int) smpi_process_getarg(integer* index, char* dst, ftnlen len);
 XBT_PUBLIC(int) smpi_global_rank(void);
 XBT_PUBLIC(int) smpi_global_size(void);
 

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 86b1a09..fb4d167 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -75,10 +75,10 @@ int smpi_process_argc(void) {
   return data->argc ? *(data->argc) - 1 : 0;
 }
 
-int smpi_process_getarg(int* index, char* dst, size_t len) {
+int smpi_process_getarg(integer* index, char* dst, ftnlen len) {
   smpi_process_data_t data = smpi_process_data();
   char* arg;
-  size_t i;
+  ftnlen i;
 
   if(!data->argc || !data->argv
      || *index < 1 || *index >= *(data->argc)) {