[Cmake-commits] [cmake-commits] king committed Linux-Intel-C.cmake 1.3 1.4 Linux-Intel-CXX.cmake 1.5 1.6 Linux-Intel-Fortran.cmake 1.2 1.3 Linux-Intel.cmake NONE 1.1

[cmake-commits at cmake.org]

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

Modified Files:
	Linux-Intel-Fortran.cmake 
Added Files:
	Linux-Intel-C.cmake Linux-Intel-CXX.cmake Linux-Intel.cmake 
Log Message:
Use Intel for Linux flags only on Linux

The commit "Split Intel compiler information files" moved some Linux
specific flags into the platform-independent Intel compiler info files.
This moves them back.


--- NEW FILE: Linux-Intel-C.cmake ---
INCLUDE(Platform/Linux-Intel)
IF(XIAR)
  SET(CMAKE_C_CREATE_STATIC_LIBRARY
    "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
    "${XIAR} -s <TARGET> ")
ENDIF(XIAR)

--- NEW FILE: Linux-Intel.cmake ---
if(NOT XIAR)
  set(_intel_xair_hints)
  foreach(lang C CXX Fortran)
    if(IS_ABSOLUTE "${CMAKE_${lang}_COMPILER}")
      get_filename_component(_hint "${CMAKE_${lang}_COMPILER}" PATH)
      list(APPEND _intel_xair_hints ${_hint})
    endif()
  endforeach()
  find_program(XIAR NAMES xiar HINTS ${_intel_xair_hints})
  mark_as_advanced(XIAR)
endif(NOT XIAR)

Index: Linux-Intel-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-Fortran.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** Linux-Intel-Fortran.cmake	21 Aug 2009 13:54:42 -0000	1.2
--- Linux-Intel-Fortran.cmake	1 Sep 2009 17:55:13 -0000	1.3
***************
*** 1 ****
--- 1,14 ----
+ INCLUDE(Platform/Linux-Intel)
+ IF(XIAR)
+   SET(CMAKE_Fortran_CREATE_STATIC_LIBRARY
+     "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
+     "${XIAR} -s <TARGET> ")
+ ENDIF(XIAR)
+ 
+ SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")
+ SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-shared")
+ SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic")
+ SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG "-Wl,-rpath,")
+ SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ":")
+ SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,")
  SET(CMAKE_DL_LIBS "dl")

--- NEW FILE: Linux-Intel-CXX.cmake ---
INCLUDE(Platform/Linux-Intel)
IF(XIAR)
  SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
    "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
    "${XIAR} -s <TARGET> ")
ENDIF(XIAR)