immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add MSVC compiler detection

master
Piotr Dziwinski 2015-04-27 18:03:06 +02:00
parent d23170aaf1
commit f52650edb5
1 changed files with 7 additions and 5 deletions

12
CMakeLists.txt
View File

@ -85,7 +85,7 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
set(PLATFORM_GNU 0) set(PLATFORM_GNU 0)
set(PLATFORM_MACOSX 1) set(PLATFORM_MACOSX 1)
set(PLATFORM_OTHER 0) set(PLATFORM_OTHER 0)
# Platform-dependent implementation of system.h # Platform-dependent implementation of system.h
set(SYSTEM_CPP_MODULE "system_macosx.cpp") set(SYSTEM_CPP_MODULE "system_macosx.cpp")
@ -114,7 +114,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_MODULE_PATH "${colobot_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH "${colobot_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
# Compiler detection # Compiler detection
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
execute_process( execute_process(
COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7) if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
@ -126,12 +126,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
else() else()
message(FATAL_ERROR "${PROJECT_NAME} requires GCC 4.6 or greater.") message(FATAL_ERROR "${PROJECT_NAME} requires GCC 4.6 or greater.")
endif() endif()
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message(STATUS "Detected Clang compiler") message(STATUS "Detected Clang compiler")
set(CXX11_FLAGS "-std=c++11") set(CXX11_FLAGS "-std=c++11")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
message(STATUS "Detected MSVC compiler")
set(CXX11_FLAGS "")
else() else()
message(FATAL_ERROR "Your C++ compiler doesn't seem to support C++11.\n" message(FATAL_ERROR "Your C++ compiler doesn't seem to be supported.")
"Supported compilers at this time are GCC 4.6+ and clang.")
endif() endif()