diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-19 14:04:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 14:04:22 +0100 |
| commit | 9ead1bfe5afd7e519fe5f83b6603e5147fa91411 (patch) | |
| tree | 33f872deb81edd3de5609a1519c11083461f4b07 /cmake/ProjSystemInfo.cmake | |
| parent | 42b9332f70859e5f428901cd801c2a4064373373 (diff) | |
| parent | 2622d3851573cd44fc7b36bfd15f07215f434d4b (diff) | |
| download | PROJ-9ead1bfe5afd7e519fe5f83b6603e5147fa91411.tar.gz PROJ-9ead1bfe5afd7e519fe5f83b6603e5147fa91411.zip | |
Merge pull request #1330 from mwtoews/cmake
Normalize CMake with cmakelint, 2-space indent
Diffstat (limited to 'cmake/ProjSystemInfo.cmake')
| -rw-r--r-- | cmake/ProjSystemInfo.cmake | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cmake/ProjSystemInfo.cmake b/cmake/ProjSystemInfo.cmake index 18a80fa7..4265bacf 100644 --- a/cmake/ProjSystemInfo.cmake +++ b/cmake/ProjSystemInfo.cmake @@ -56,18 +56,18 @@ if(WIN32) if(MSVC_VERSION GREATER 1900 AND MSVC_VERSION LESS 1920) # CMake 3.8+ set(PROJ_COMPILER_NAME "msvc-14.1") #Visual Studio 2017 endif() - endif(MSVC) - + endif() + if(MINGW) set(PROJ_COMPILER_NAME "mingw-${GCC_VERSION}") - endif( MINGW ) - + endif() + if(CMAKE_GENERATOR MATCHES "Win64") set(PROJ_PLATFORM_NAME "x64") else() set(PROJ_PLATFORM_NAME "win32") endif() -endif(WIN32) +endif() # WIN32 if(UNIX) set(PROJ_COMPILER_NAME "gcc-${GCC_VERSION}") @@ -76,14 +76,16 @@ if(UNIX) else() set(PROJ_PLATFORM_NAME "x86") endif() -endif(UNIX) +endif() if(NOT PROJ_COMPILER_NAME) colormsg(_RED_ "WARNING:") - colormsg(RED "Could not determine compiler toolset name to set PROJ_COMPILER_NAME variable.") + colormsg(RED "Could not determine compiler toolset name to set \ +PROJ_COMPILER_NAME variable.") endif() if(NOT PROJ_COMPILER_NAME) colormsg(_RED_ "WARNING:") - colormsg(RED "Could not determine platform name to set PROJ_COMPILER_NAME variable.") + colormsg(RED "Could not determine platform name to set \ +PROJ_COMPILER_NAME variable.") endif() |