diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2019-04-18 11:28:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 11:28:44 +0200 |
| commit | ab22c860e6e5356eb96ce41f49ec763f4df053e1 (patch) | |
| tree | b35752c8f8e4c3d00518a60e0ae2b03f1baf0450 /cmake | |
| parent | 4760c708ed7697178d55eac76332cdd63c54eb8c (diff) | |
| parent | 421653b9c61f253e800ca749e9b1a9ba0688d72a (diff) | |
| download | PROJ-ab22c860e6e5356eb96ce41f49ec763f4df053e1.tar.gz PROJ-ab22c860e6e5356eb96ce41f49ec763f4df053e1.zip | |
Merge pull request #1426 from mwtoews/intel
CMake: better support for Intel compiler
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ProjSystemInfo.cmake | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cmake/ProjSystemInfo.cmake b/cmake/ProjSystemInfo.cmake index 4265bacf..0ad4a077 100644 --- a/cmake/ProjSystemInfo.cmake +++ b/cmake/ProjSystemInfo.cmake @@ -62,6 +62,10 @@ if(WIN32) set(PROJ_COMPILER_NAME "mingw-${GCC_VERSION}") endif() + if(CMAKE_C_COMPILER_ID STREQUAL "Intel") + set(PROJ_COMPILER_NAME "intel-win") + endif() + if(CMAKE_GENERATOR MATCHES "Win64") set(PROJ_PLATFORM_NAME "x64") else() @@ -70,7 +74,12 @@ if(WIN32) endif() # WIN32 if(UNIX) - set(PROJ_COMPILER_NAME "gcc-${GCC_VERSION}") + if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") + set(PROJ_COMPILER_NAME "gcc-${GCC_VERSION}") + elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel") + set(PROJ_COMPILER_NAME "intel-linux") + endif() + if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") set(PROJ_PLATFORM_NAME "x64") else() |