lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made CMake files compatible with VC++ 2011, and other minor improvements

Browse source
This commit is contained in:
Laurent Gomila 2011-12-28 21:39:23 +01:00
parent 94a9dfbdfb
commit 4107505a05
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cmake/Config.cmake
View file

@ -29,8 +29,11 @@ include(CheckTypeSize)
check_type_size(void* SIZEOF_VOID_PTR)
if(${SIZEOF_VOID_PTR} MATCHES "^4$")
set(ARCH_32BITS 1)
else()
elseif(${SIZEOF_VOID_PTR} MATCHES "^8$")
set(ARCH_64BITS 1)
else()
message(WARNING "Unsupported architecture")
return()
endif()
# detect the compiler and its version
@ -38,12 +41,15 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(COMPILER_GCC 1)
execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-dumpversion" OUTPUT_VARIABLE GCC_VERSION_OUTPUT)
string(REGEX REPLACE "([0-9]+\\.[0-9]+).*" "\\1" GCC_VERSION "${GCC_VERSION_OUTPUT}")
elseif(MSVC_VERSION EQUAL 1400)
set(COMPILER_MSVC 2005)
elseif(MSVC_VERSION EQUAL 1500)
set(COMPILER_MSVC 2008)
elseif(MSVC_VERSION EQUAL 1600)
set(COMPILER_MSVC 2010)
elseif(MSVC)
set(COMPILER_MSVC 1)
if(MSVC_VERSION EQUAL 1400)
set(MSVC_VERSION 2005)
elseif(MSVC_VERSION EQUAL 1500)
set(MSVC_VERSION 2008)
elseif(MSVC_VERSION EQUAL 1600)
set(MSVC_VERSION 2010)
endif()
else()
message(WARNING "Unsupported compiler")
return()