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

Made compiler and OS variable names much clearer in CMake files

Browse source
This commit is contained in:
Laurent Gomila 2013-10-09 08:01:10 +02:00
parent fe12270d62
commit 9b0ed300b5
11 changed files with 74 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

40
cmake/Config.cmake
View file

@ -1,6 +1,6 @@
# detect the OS
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(WINDOWS 1)
set(SFML_OS_WINDOWS 1)
# detect the architecture (note: this test won't work for cross-compilation)
include(CheckTypeSize)
@ -14,13 +14,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
return()
endif()
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(LINUX 1)
set(UNIX 1)
set(SFML_OS_LINUX 1)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
set(FreeBSD 1)
set(UNIX 1)
set(SFML_OS_FREEBSD 1)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(MACOSX 1)
set(SFML_OS_MACOSX 1)
# detect OS X version. (use '/usr/bin/sw_vers -productVersion' to extract V from '10.V.x'.)
EXEC_PROGRAM(/usr/bin/sw_vers ARGS -productVersion OUTPUT_VARIABLE MACOSX_VERSION_RAW)
@ -40,28 +38,28 @@ endif()
if(CMAKE_CXX_COMPILER MATCHES ".*clang[+][+]" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
# CMAKE_CXX_COMPILER_ID is an internal CMake variable subject to change,
# but there is no other way to detect CLang at the moment
set(COMPILER_CLANG 1)
set(SFML_COMPILER_CLANG 1)
execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "--version" OUTPUT_VARIABLE CLANG_VERSION_OUTPUT)
string(REGEX REPLACE ".*clang version ([0-9]+\\.[0-9]+).*" "\\1" CLANG_VERSION "${CLANG_VERSION_OUTPUT}")
string(REGEX REPLACE ".*clang version ([0-9]+\\.[0-9]+).*" "\\1" SFML_CLANG_VERSION "${CLANG_VERSION_OUTPUT}")
elseif(CMAKE_COMPILER_IS_GNUCXX)
set(COMPILER_GCC 1)
set(SFML_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}")
string(REGEX REPLACE "([0-9]+\\.[0-9]+).*" "\\1" SFML_GCC_VERSION "${GCC_VERSION_OUTPUT}")
execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-dumpmachine" OUTPUT_VARIABLE GCC_MACHINE)
string(STRIP "${GCC_MACHINE}" GCC_MACHINE)
if(${GCC_MACHINE} MATCHES ".*w64.*")
set(COMPILER_GCC_W64 1)
set(SFML_COMPILER_GCC_W64 1)
endif()
elseif(MSVC)
set(COMPILER_MSVC 1)
set(SFML_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)
elseif(MSVC_VERSION EQUAL 1700)
set(MSVC_VERSION 2011)
set(SFML_MSVC_VERSION 2005)
elseif(SFML_MSVC_VERSION EQUAL 1500)
set(SFML_MSVC_VERSION 2008)
elseif(SFML_MSVC_VERSION EQUAL 1600)
set(SFML_MSVC_VERSION 2010)
elseif(SFML_MSVC_VERSION EQUAL 1700)
set(SFML_MSVC_VERSION 2011)
endif()
else()
message(FATAL_ERROR "Unsupported compiler")
@ -69,8 +67,8 @@ else()
endif()
# define the install directory for miscellaneous files
if(WINDOWS)
if(SFML_OS_WINDOWS)
set(INSTALL_MISC_DIR .)
elseif(UNIX)
elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOSX)
set(INSTALL_MISC_DIR share/SFML)
endif()