From f160c398149422e43dcf90b3211b23005f4e3d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20A=2E=20Col=C3=B3n=20V=C3=A9lez?= Date: Mon, 12 Jan 2015 02:54:49 -0500 Subject: [PATCH] Remove dead code from cmake/ApiValidation.cmake. --- cmake/ApiValidation.cmake | 45 --------------------------------------- 1 file changed, 45 deletions(-) diff --git a/cmake/ApiValidation.cmake b/cmake/ApiValidation.cmake index 0e0f7f5e3c..489e1413dd 100644 --- a/cmake/ApiValidation.cmake +++ b/cmake/ApiValidation.cmake @@ -6,14 +6,6 @@ set(wx_sdl_c_code " #endif ") -set(wx_gtk3_c_code " -#include - -#ifdef __WXGTK3__ -#error cmake_WX_GTK3 -#endif -") - function(WX_vs_SDL) file(WRITE "${CMAKE_BINARY_DIR}/wx_sdl.c" "${wx_sdl_c_code}") enable_language(C) @@ -32,41 +24,4 @@ function(WX_vs_SDL) Unfortunately you try to build PCSX2 with SDL2 support which is not compatible Please use -DSDL2_API=FALSE") endif() - -endfunction() - -function(WX_vs_GTK3) - file(WRITE "${CMAKE_BINARY_DIR}/wx_gtk3.c" "${wx_gtk3_c_code}") - enable_language(C) - - try_run( - run_result_unused - compile_result_unused - "${CMAKE_BINARY_DIR}" - "${CMAKE_BINARY_DIR}/wx_gtk3.c" - COMPILE_OUTPUT_VARIABLE OUT - CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${wxWidgets_INCLUDE_DIRS}" - ) - - if (${OUT} MATCHES "cmake_WX_GTK3") - if (NOT GTK3_API) - message(FATAL_ERROR "Your current WxWidget version requires GTK3. Please use -DGTK3_API=TRUE option") - endif() - else() - if (GTK3_API) - message(FATAL_ERROR "Your current WxWidget version doesn't support GTK3. Please use -DGTK3_API=FALSE option") - endif() - endif() - -endfunction() - -function(WX_version) - EXECUTE_PROCESS(COMMAND ${wxWidgets_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE version) - STRING(STRIP ${version} version) - if (${version} MATCHES "3.0" AND WX28_API) - message(FATAL_ERROR "Mismatch between wx-config version (${version}) and requested WX API (2.8.x)") - endif() - if (${version} MATCHES "2.8" AND NOT WX28_API) - message(FATAL_ERROR "Mismatch between wx-config version (${version}) and requested WX API (3.0.x)") - endif() endfunction()