[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.5.2.2 1.5.2.3 Detect.cmake 1.2.2.1 1.2.2.2 mymodule_.c 1.2 1.2.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt Detect.cmake mymodule_.c 
Log Message:
CMake 2.8.1-rc1


Index: Detect.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FortranCInterface/Detect.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** Detect.cmake	1 Oct 2009 21:20:35 -0000	1.2.2.1
--- Detect.cmake	28 Jan 2010 21:47:43 -0000	1.2.2.2
***************
*** 40,43 ****
--- 40,46 ----
    ${FortranCInterface_SOURCE_DIR}
    FortranCInterface
+   CMAKE_FLAGS
+     "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"
+     "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"
    OUTPUT_VARIABLE FortranCInterface_OUTPUT)
  set(FortranCInterface_COMPILED ${FortranCInterface_COMPILED})

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FortranCInterface/CMakeLists.txt,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C 2 -d -r1.5.2.2 -r1.5.2.3
*** CMakeLists.txt	9 Oct 2009 20:11:11 -0000	1.5.2.2
--- CMakeLists.txt	28 Jan 2010 21:47:43 -0000	1.5.2.3
***************
*** 57,60 ****
--- 57,61 ----
  #   MIPSpro uses "MY_SUB.in.MY_MODULE"
  #   SunPro uses "my_module.my_sub_"
+ #   PathScale uses "MY_SUB.in.MY_MODULE"
  
  # Add module symbols only with Fortran90.

Index: mymodule_.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FortranCInterface/mymodule_.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** mymodule_.c	5 Aug 2009 21:07:36 -0000	1.2
--- mymodule_.c	28 Jan 2010 21:47:43 -0000	1.2.2.1
***************
*** 1,2 ****
--- 1,8 ----
+ #if defined(__PATHSCALE__)
+ /* PathScale Fortran wants mymodule_ when calling any mymodule symbol,
+    but module symbols use '.in.' so we cannot provide them anyway.  */
+ void pathscale_mymodule_(void) {}
+ #else
  /* PGI Fortran wants mymodule_ when calling any mymodule symbol.  */
  void mymodule_(void) {}
+ #endif