diff options
| author | Brad King <brad.king@kitware.com> | 2009-09-01 17:55:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-09-01 17:55:13 (GMT) |
| commit | 2eca4dd2d127ab8e7ba211a17139983bbef61802 (patch) | |
| tree | 7d21495e251a32cac727b9552b1f9dad46dfb092 /Modules/Compiler | |
| parent | dc78838737a14a887e2932cb06a0adaaf8c80fef (diff) | |
| download | CMake-2eca4dd2d127ab8e7ba211a17139983bbef61802.zip CMake-2eca4dd2d127ab8e7ba211a17139983bbef61802.tar.gz CMake-2eca4dd2d127ab8e7ba211a17139983bbef61802.tar.bz2 | |
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.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/Intel-C.cmake | 7 | ||||
| -rw-r--r-- | Modules/Compiler/Intel-CXX.cmake | 7 | ||||
| -rw-r--r-- | Modules/Compiler/Intel-Fortran.cmake | 14 | ||||
| -rw-r--r-- | Modules/Compiler/Intel.cmake | 11 |
4 files changed, 0 insertions, 39 deletions
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) |