From 90c4322fc5124889e02b16f28d48a9e690a7358f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20A=2E=20Col=C3=B3n=20V=C3=A9lez?= Date: Fri, 9 Jan 2015 07:44:26 -0500 Subject: [PATCH] Remove check for wxrc since it's not needed. --- cmake/SearchForStuff.cmake | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index cfbe8f8c5..8c8918e72 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -35,28 +35,24 @@ else() list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk2) endif() -# wx2.8 => /usr/bin/wx-config-2.8, /usr/bin/wxrc-2.8 -# lib32-wx2.8 => /usr/bin/wx-config32-2.8, /usr/bin/wxrc32-2.8 -# wx3.0 => /usr/bin/wx-config-3.0, /usr/bin/wxrc-3.0 +# wx2.8 => /usr/bin/wx-config-2.8 +# lib32-wx2.8 => /usr/bin/wx-config32-2.8 +# wx3.0 => /usr/bin/wx-config-3.0 # I'm going to take a wild guess and predict this: -# lib32-wx3.0 => /usr/bin/wx-config32-3.0, /usr/bin/wxrc32-3.0 -# FindwxWidgets only searches for wxrc and wx-config. +# lib32-wx3.0 => /usr/bin/wx-config32-3.0 +# FindwxWidgets only searches for wx-config. if(CMAKE_CROSSCOMPILING) # May need to fix the filenames for lib32-wx3.0. - if(NOT WX28_API AND ${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386" AND EXISTS "/usr/bin/wx-config32-3.0" AND EXISTS "/usr/bin/wxrc32-3.0") + if(NOT WX28_API AND ${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386" AND EXISTS "/usr/bin/wx-config32-3.0") set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config32-3.0") - set(wxWidgets_wxrc_EXECUTABLE "/usr/bin/wxrc32-3.0") - elseif(WX28_API AND ${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386" AND EXISTS "/usr/bin/wx-config32-2.8" AND EXISTS "/usr/bin/wxrc32-2.8") + elseif(WX28_API AND ${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386" AND EXISTS "/usr/bin/wx-config32-2.8") set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config32-2.8") - set(wxWidgets_wxrc_EXECUTABLE "/usr/bin/wxrc32-2.8") endif() else() - if(NOT WX28_API AND EXISTS "/usr/bin/wx-config-3.0" AND EXISTS "/usr/bin/wxrc-3.0") + if(NOT WX28_API AND EXISTS "/usr/bin/wx-config-3.0") set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.0") - set(wxWidgets_wxrc_EXECUTABLE "/usr/bin/wxrc-3.0") - elseif(WX28_API AND EXISTS "/usr/bin/wx-config-2.8" AND EXISTS "/usr/bin/wxrc-2.8") + elseif(WX28_API AND EXISTS "/usr/bin/wx-config-2.8") set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-2.8") - set(wxWidgets_wxrc_EXECUTABLE "/usr/bin/wxrc-2.8") endif() endif()