[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.2 1.3 my_module_.c 1.1 1.2 mymodule_.c 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/FortranCInterface
In directory public:/mounts/ram/cvs-serv18762/Modules/FortranCInterface

Modified Files:
	CMakeLists.txt my_module_.c mymodule_.c 
Log Message:
Cleanup FortranCInterface for PGI and GCC 4.2

This documents the purpose of the extra my_module_.c and mymodule.c
source files, and sorts the symbols.


Index: my_module_.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FortranCInterface/my_module_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** my_module_.c	5 Aug 2009 20:55:57 -0000	1.1
--- my_module_.c	5 Aug 2009 21:07:36 -0000	1.2
***************
*** 1 ****
! void my_module_(void){}
--- 1,2 ----
! /* PGI Fortran wants my_module_ when calling any my_module symbol.  */
! void my_module_(void) {}

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FortranCInterface/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CMakeLists.txt	5 Aug 2009 20:55:57 -0000	1.2
--- CMakeLists.txt	5 Aug 2009 21:07:36 -0000	1.3
***************
*** 23,37 ****
  set(module_symbols
    __my_module_MOD_my_sub  # GNU 4.3
-   __my_module__my_sub     # GNU 4.2
-   __mymodule__mysub       # GNU 4.2
    __my_module_NMOD_my_sub # VisualAge
!   __mymodule_MOD_mysub    # GNU
    __mymodule_NMOD_mysub   # VisualAge
!   my_module_my_sub_       # PGI 8
    my_module$my_sub        # HP
    my_module_mp_my_sub_    # Intel
!   mymodule_mysub_         # PGI 8
    mymodule$mysub          # HP
    mymodule_mp_mysub_      # Intel
    ${FortranCInterface_MODULE_SYMBOLS}
    )
--- 23,37 ----
  set(module_symbols
    __my_module_MOD_my_sub  # GNU 4.3
    __my_module_NMOD_my_sub # VisualAge
!   __my_module__my_sub     # GNU 4.2
!   __mymodule_MOD_mysub    # GNU 4.3
    __mymodule_NMOD_mysub   # VisualAge
!   __mymodule__mysub       # GNU 4.2
    my_module$my_sub        # HP
    my_module_mp_my_sub_    # Intel
!   my_module_my_sub_       # PGI
    mymodule$mysub          # HP
    mymodule_mp_mysub_      # Intel
+   mymodule_mysub_         # PGI
    ${FortranCInterface_MODULE_SYMBOLS}
    )
***************
*** 71,75 ****
  
  # Provide symbols through C but fall back to Fortran.
! add_library(symbols STATIC ${symbol_sources} mymodule_.c my_module_.c)
  target_link_libraries(symbols myfort)
  
--- 71,75 ----
  
  # Provide symbols through C but fall back to Fortran.
! add_library(symbols STATIC mymodule_.c my_module_.c ${symbol_sources})
  target_link_libraries(symbols myfort)
  

Index: mymodule_.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FortranCInterface/mymodule_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** mymodule_.c	5 Aug 2009 20:55:57 -0000	1.1
--- mymodule_.c	5 Aug 2009 21:07:36 -0000	1.2
***************
*** 1 ****
! void mymodule_(void){}
--- 1,2 ----
! /* PGI Fortran wants mymodule_ when calling any mymodule symbol.  */
! void mymodule_(void) {}