From 2eca4dd2d127ab8e7ba211a17139983bbef61802 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 1 Sep 2009 13:55:13 -0400
Subject: 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.
---
 Modules/Compiler/Intel-C.cmake             |  7 -------
 Modules/Compiler/Intel-CXX.cmake           |  7 -------
 Modules/Compiler/Intel-Fortran.cmake       | 14 --------------
 Modules/Compiler/Intel.cmake               | 11 -----------
 Modules/Platform/Linux-Intel-C.cmake       |  6 ++++++
 Modules/Platform/Linux-Intel-CXX.cmake     |  6 ++++++
 Modules/Platform/Linux-Intel-Fortran.cmake | 13 +++++++++++++
 Modules/Platform/Linux-Intel.cmake         | 11 +++++++++++
 8 files changed, 36 insertions(+), 39 deletions(-)
 delete mode 100644 Modules/Compiler/Intel.cmake
 create mode 100644 Modules/Platform/Linux-Intel-C.cmake
 create mode 100644 Modules/Platform/Linux-Intel-CXX.cmake
 create mode 100644 Modules/Platform/Linux-Intel.cmake

diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 57637b9..8f8aaaa 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -1,10 +1,3 @@
-INCLUDE(Compiler/Intel)
-IF(XIAR)
-  SET(CMAKE_C_CREATE_STATIC_LIBRARY
-    "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
-    "${XIAR} -s <TARGET> ")
-ENDIF(XIAR)
-
 SET(CMAKE_C_VERBOSE_FLAG "-v")
 
 SET(CMAKE_C_FLAGS_INIT "")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index d1ee60f..56950f0 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -1,10 +1,3 @@
-INCLUDE(Compiler/Intel)
-IF(XIAR)
-  SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
-    "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
-    "${XIAR} -s <TARGET> ")
-ENDIF(XIAR)
-
 SET(CMAKE_CXX_VERBOSE_FLAG "-v")
 
 SET(CMAKE_CXX_FLAGS_INIT "")
diff --git a/Modules/Compiler/Intel-Fortran.cmake b/Modules/Compiler/Intel-Fortran.cmake
index f0db1a8..f38b32e 100644
--- a/Modules/Compiler/Intel-Fortran.cmake
+++ b/Modules/Compiler/Intel-Fortran.cmake
@@ -1,17 +1,3 @@
-INCLUDE(Compiler/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_Fortran_FLAGS_INIT "")
 SET(CMAKE_Fortran_FLAGS_DEBUG_INIT "-g")
 SET(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os")
diff --git a/Modules/Compiler/Intel.cmake b/Modules/Compiler/Intel.cmake
deleted file mode 100644
index 030f2c0..0000000
--- a/Modules/Compiler/Intel.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-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)
diff --git a/Modules/Platform/Linux-Intel-C.cmake b/Modules/Platform/Linux-Intel-C.cmake
new file mode 100644
index 0000000..554945e
--- /dev/null
+++ b/Modules/Platform/Linux-Intel-C.cmake
@@ -0,0 +1,6 @@
+INCLUDE(Platform/Linux-Intel)
+IF(XIAR)
+  SET(CMAKE_C_CREATE_STATIC_LIBRARY
+    "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
+    "${XIAR} -s <TARGET> ")
+ENDIF(XIAR)
diff --git a/Modules/Platform/Linux-Intel-CXX.cmake b/Modules/Platform/Linux-Intel-CXX.cmake
new file mode 100644
index 0000000..faa19e3
--- /dev/null
+++ b/Modules/Platform/Linux-Intel-CXX.cmake
@@ -0,0 +1,6 @@
+INCLUDE(Platform/Linux-Intel)
+IF(XIAR)
+  SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
+    "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
+    "${XIAR} -s <TARGET> ")
+ENDIF(XIAR)
diff --git a/Modules/Platform/Linux-Intel-Fortran.cmake b/Modules/Platform/Linux-Intel-Fortran.cmake
index 266599e..1db5ba6 100644
--- a/Modules/Platform/Linux-Intel-Fortran.cmake
+++ b/Modules/Platform/Linux-Intel-Fortran.cmake
@@ -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")
diff --git a/Modules/Platform/Linux-Intel.cmake b/Modules/Platform/Linux-Intel.cmake
new file mode 100644
index 0000000..030f2c0
--- /dev/null
+++ b/Modules/Platform/Linux-Intel.cmake
@@ -0,0 +1,11 @@
+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)
-- 
cgit v0.12