diff options
| author | David Cole <david.cole@kitware.com> | 2010-11-16 19:46:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-16 19:46:30 (GMT) |
| commit | c172ffef061c1bf412389fdf01275cf91aa2ff79 (patch) | |
| tree | 1d28533950a2d04a5fd09de6d770aaf99e2f3420 /Modules | |
| parent | e19fa08ac9df21826b5427c4d4442a5eee45b9f9 (diff) | |
| parent | 53e76c8f126fd2480c560cf2bb46a93eabbc91fa (diff) | |
| download | CMake-c172ffef061c1bf412389fdf01275cf91aa2ff79.zip CMake-c172ffef061c1bf412389fdf01275cf91aa2ff79.tar.gz CMake-c172ffef061c1bf412389fdf01275cf91aa2ff79.tar.bz2 | |
Merge topic 'cray-compiler'
53e76c8 Teach CMake about Cray C, C++, and Fortran compilers
34e1ac2 Create Fortran info variables for .mod behavior
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCCompilerId.c.in | 3 | ||||
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 3 | ||||
| -rw-r--r-- | Modules/CMakeFortranCompilerId.F.in | 2 | ||||
| -rw-r--r-- | Modules/Compiler/Cray-C.cmake | 1 | ||||
| -rw-r--r-- | Modules/Compiler/Cray-CXX.cmake | 1 | ||||
| -rw-r--r-- | Modules/Compiler/Cray-Fortran.cmake | 4 |
6 files changed, 14 insertions, 0 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index accda32..2b80c88 100644 --- a/Modules/CMakeCCompilerId.c.in +++ b/Modules/CMakeCCompilerId.c.in @@ -42,6 +42,9 @@ #elif defined(__PATHSCALE__) # define COMPILER_ID "PathScale" +#elif defined(_CRAYC) +# define COMPILER_ID "Cray" + #elif defined(__GNUC__) # define COMPILER_ID "GNU" diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 4a32823..91f116a 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -44,6 +44,9 @@ #elif defined(__PATHSCALE__) # define COMPILER_ID "PathScale" +#elif defined(_CRAYC) +# define COMPILER_ID "Cray" + #elif defined(__GNUC__) # define COMPILER_ID "GNU" diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in index 107470c..4080cc1 100644 --- a/Modules/CMakeFortranCompilerId.F.in +++ b/Modules/CMakeFortranCompilerId.F.in @@ -6,6 +6,8 @@ PRINT *, 'INFO:compiler[Intel]' #elif defined(__SUNPRO_F90) || defined(__SUNPRO_F95) PRINT *, 'INFO:compiler[SunPro]' +#elif defined(_CRAYFTN) + PRINT *, 'INFO:compiler[Cray]' #elif defined(__G95__) PRINT *, 'INFO:compiler[G95]' #elif defined(__PATHSCALE__) diff --git a/Modules/Compiler/Cray-C.cmake b/Modules/Compiler/Cray-C.cmake new file mode 100644 index 0000000..675560c --- /dev/null +++ b/Modules/Compiler/Cray-C.cmake @@ -0,0 +1 @@ +set(CMAKE_C_VERBOSE_FLAG "-v") diff --git a/Modules/Compiler/Cray-CXX.cmake b/Modules/Compiler/Cray-CXX.cmake new file mode 100644 index 0000000..9fb191c --- /dev/null +++ b/Modules/Compiler/Cray-CXX.cmake @@ -0,0 +1 @@ +set(CMAKE_CXX_VERBOSE_FLAG "-v") diff --git a/Modules/Compiler/Cray-Fortran.cmake b/Modules/Compiler/Cray-Fortran.cmake new file mode 100644 index 0000000..4f45176 --- /dev/null +++ b/Modules/Compiler/Cray-Fortran.cmake @@ -0,0 +1,4 @@ +set(CMAKE_Fortran_VERBOSE_FLAG "-v") +set(CMAKE_Fortran_MODOUT_FLAG -em) +set(CMAKE_Fortran_MODDIR_FLAG -J) +set(CMAKE_Fortran_MODDIR_DEFAULT .) |