[Cmake-commits] [cmake-commits] king committed CMakeCXXInformation.cmake 1.31 1.32 CMakeFortranInformation.cmake 1.26 1.27

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCXXInformation.cmake CMakeFortranInformation.cmake 
Log Message:
Reduce duplication in Platform/<os>.cmake files

Several platform-wide linker flag variables are defined in
Modules/Platform/<os>.cmake files for C and then copied by the
Modules/CMake<lang>Information.cmake file for each language.
We now use this approach for the variables

  CMAKE_EXE_EXPORTS_${lang}_FLAG
  CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG
  CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS

to avoid duplication for multiple languages in each platform file.


Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -d -r1.31 -r1.32
*** CMakeCXXInformation.cmake	2 Dec 2009 20:17:30 -0000	1.31
--- CMakeCXXInformation.cmake	2 Dec 2009 20:17:52 -0000	1.32
***************
*** 115,118 ****
--- 115,126 ----
  ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG)
  
+ IF(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG)
+   SET(CMAKE_EXE_EXPORTS_CXX_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
+ ENDIF()
+ 
+ IF(NOT DEFINED CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG)
+   SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG})
+ ENDIF()
+ 
  IF(NOT CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG)
    SET(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})

Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.26
retrieving revision 1.27
diff -C 2 -d -r1.26 -r1.27
*** CMakeFortranInformation.cmake	2 Dec 2009 20:17:31 -0000	1.26
--- CMakeFortranInformation.cmake	2 Dec 2009 20:17:52 -0000	1.27
***************
*** 90,93 ****
--- 90,101 ----
  ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG)
  
+ IF(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
+   SET(CMAKE_EXE_EXPORTS_Fortran_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
+ ENDIF()
+ 
+ IF(NOT DEFINED CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG)
+   SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG})
+ ENDIF()
+ 
  # repeat for modules
  IF(NOT CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS)