From a733e4cd7e0056922e4f74f1932749b4d6a5744d Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Thu, 17 Feb 2022 11:35:25 -0700 Subject: [PATCH] Remove unused CMake variables --- cmake/Config.cmake | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/cmake/Config.cmake b/cmake/Config.cmake index dad681289..6a60f5704 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -81,50 +81,19 @@ if(SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD) set(SFML_PKGCONFIG_DIR "/libdata/pkgconfig") endif() -# detect the compiler and its version +# detect the compiler # Note: The detection is order is important because: # - Visual Studio can both use MSVC and Clang # - GNUCXX can still be set on macOS when using Clang if(MSVC) set(SFML_COMPILER_MSVC 1) - - if(MSVC_VERSION EQUAL 1400) - set(SFML_MSVC_VERSION 8) - elseif(MSVC_VERSION EQUAL 1500) - set(SFML_MSVC_VERSION 9) - elseif(MSVC_VERSION EQUAL 1600) - set(SFML_MSVC_VERSION 10) - elseif(MSVC_VERSION EQUAL 1700) - set(SFML_MSVC_VERSION 11) - elseif(MSVC_VERSION EQUAL 1800) - set(SFML_MSVC_VERSION 12) - elseif(MSVC_VERSION EQUAL 1900) - set(SFML_MSVC_VERSION 14) - elseif(MSVC_VERSION LESS_EQUAL 1919) - set(SFML_MSVC_VERSION 15) - elseif(MSVC_VERSION LESS_EQUAL 1929) - set(SFML_MSVC_VERSION 16) - elseif(MSVC_VERSION LESS_EQUAL 1939) - set(SFML_MSVC_VERSION 17) - endif() elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") 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" SFML_CLANG_VERSION "${CLANG_VERSION_OUTPUT}") elseif(CMAKE_COMPILER_IS_GNUCXX) 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" SFML_GCC_VERSION "${GCC_VERSION_OUTPUT}") execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "--version" OUTPUT_VARIABLE GCC_COMPILER_VERSION) string(REGEX MATCHALL ".*(tdm[64]*-[1-9]).*" SFML_COMPILER_GCC_TDM "${GCC_COMPILER_VERSION}") - execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-dumpmachine" OUTPUT_VARIABLE GCC_MACHINE) - string(STRIP "${GCC_MACHINE}" GCC_MACHINE) - - if(GCC_MACHINE MATCHES ".*w64.*") - set(SFML_COMPILER_GCC_W64 1) - endif() else() message(FATAL_ERROR "Unsupported compiler") return()